rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-30 19:52:13 +01:00
Code Issues Releases Activity

Compiler: fixed wrong check against non existent folder and a possible NPE

Browse Source
This commit is contained in:
Federico Fissore 2015-06-29 15:32:32 +02:00
parent e097439eab
commit a853372872
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arduino-core/src/processing/app/debug/Compiler.java
View File

@ -359,7 +359,7 @@ public class Compiler implements MessageConsumer {
*/
public boolean compile(boolean _verbose, boolean _save) throws RunnerException, PreferencesMapException {
File sketchBuildFolder = new File(prefs.get("build.path"), "sketch");
if (!sketchBuildFolder.mkdirs()) {
if (!sketchBuildFolder.exists() && !sketchBuildFolder.mkdirs()) {
throw new RunnerException("Unable to create folder " + sketchBuildFolder);
}
preprocess(sketchBuildFolder.getAbsolutePath());
@ -489,6 +489,9 @@ public class Compiler implements MessageConsumer {
}
private void adviseDuplicateLibraries() {
if (importedDuplicateHeaders == null) {
return;
}
for (int i=0; i < importedDuplicateHeaders.size(); i++) {
System.out.println(I18n.format(_("Multiple libraries were found for \"{0}\""),
importedDuplicateHeaders.get(i)));