Skip to content

Commit 9cf9bbb

Browse files
author
jantje
committed
fix teensy regression issue
the teensy does not have a variant and the code assumed a variant exist
1 parent df47e4b commit 9cf9bbb

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

io.sloeber.core/src/io/sloeber/core/api/BoardDescriptor.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -651,9 +651,14 @@ public boolean saveConfiguration(ICConfigurationDescription confDesc, IContribut
651651
Common.setBuildEnvironmentVariable(contribEnv, confDesc, ENV_KEY_SERIAL_PORT, this.myUploadPort);
652652
Common.setBuildEnvironmentVariable(contribEnv, confDesc, ENV_KEY_SERIAL_PORT_FILE,
653653
this.myUploadPort.replace("/dev/", new String()));
654-
655-
Common.setBuildEnvironmentVariable(contribEnv, confDesc, ENV_KEY_BUILD_VARIANT_PATH,getActualVariantPath().toOSString());
656-
654+
IPath variantPath=getActualVariantPath();
655+
if (variantPath != null) {
656+
Common.setBuildEnvironmentVariable(contribEnv, confDesc, ENV_KEY_BUILD_VARIANT_PATH,
657+
variantPath.toOSString());
658+
} else {// teensy does not use variants
659+
Common.setBuildEnvironmentVariable(contribEnv, confDesc, ENV_KEY_BUILD_VARIANT_PATH, new String());
660+
}
661+
657662
}
658663

659664
// Also save last used values

0 commit comments

Comments
 (0)