Skip to content

Commit 7e68213

Browse files
author
jantje
committed
#439 this was sort of a racing condition
What happened what that the boards.txt is processed line by line. In the esp file the upload.tool is specified 3 times for the tested board. Once as upload.tool and 2 times for the upload protocol. Apparently the upload.tool was processed after the menu. So one could say that this is a bug in the boards.txt file. However I catered for this situation.
1 parent 0c39440 commit 7e68213

File tree

1 file changed

+5
-1
lines changed
  • it.baeyens.arduino.core/src/it/baeyens/arduino/tools

1 file changed

+5
-1
lines changed

it.baeyens.arduino.core/src/it/baeyens/arduino/tools/Helpers.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,11 @@ private static void setTheEnvironmentVariablesAddtheBoardsTxt(IContributedEnviro
730730
String keyString = MakeKeyString(currentPair.getKey());
731731
String valueString = MakeEnvironmentString(currentPair.getValue(), Const.ENV_KEY_BOARD_START);
732732
contribEnv.addVariable(new EnvironmentVariable(keyString, valueString), confDesc);
733-
} else {
733+
}
734+
}
735+
for (Entry<String, String> currentPair : boardSectionMap.entrySet()) {
736+
// if it is not a menu item add it
737+
if (currentPair.getKey().startsWith(Messages.Helpers_menu)) {
734738

735739
String[] keySplit = currentPair.getKey().split("\\."); //$NON-NLS-1$
736740
String menuID = keySplit[1];

0 commit comments

Comments
 (0)