Skip to content

Commit 0a42e2a

Browse files
committed
fix for #273 compatibility of boards manager change with alder arduino versions
1 parent e19c8d6 commit 0a42e2a

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,9 @@ public static void setTheEnvironmentVariables(IProject project, ICConfigurationD
778778
setTheEnvironmentVariablesSetTheDefaults(contribEnv, confDesc, platformFilename);
779779

780780
// process the dump file from the arduino IDE
781-
setTheEnvironmentVariablesAddAFile(contribEnv, confDesc, anduinoIDEEnvNamesPath);
781+
if (anduinoIDEEnvNamesFile.exists()) {
782+
setTheEnvironmentVariablesAddAFile(contribEnv, confDesc, anduinoIDEEnvNamesPath);
783+
}
782784

783785
// process the platform.txt file first. This way the boards.txt will
784786
// overwrite the default settings

it.baeyens.arduino.core/src/it/baeyens/arduino/ui/ArduinoPreferencePage.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,12 @@ private boolean showError(String dialogMessage) {
135135
*/
136136
@Override
137137
public boolean performOk() {
138-
if (!testStatus())
138+
if (!mIsDirty) {
139+
return true;
140+
}
141+
if (!testStatus()) {
139142
return false;
140-
143+
}
141144
if (mArduinoIdeVersion.getStringValue().compareTo("1.5.0") < 0) {
142145
showError("This plugin is for Arduino IDE 1.5.x. \nPlease use V1 of the plugin for earlier versions.");
143146
return false;

0 commit comments

Comments
 (0)