From a853372872a070207c33f0e5c41d4ccd0da9b60f Mon Sep 17 00:00:00 2001 From: Federico Fissore Date: Mon, 29 Jun 2015 15:32:32 +0200 Subject: [PATCH] Compiler: fixed wrong check against non existent folder and a possible NPE --- arduino-core/src/processing/app/debug/Compiler.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arduino-core/src/processing/app/debug/Compiler.java b/arduino-core/src/processing/app/debug/Compiler.java index d570e4534..9609dd65e 100644 --- a/arduino-core/src/processing/app/debug/Compiler.java +++ b/arduino-core/src/processing/app/debug/Compiler.java @@ -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)));