noisymime
/
Arduino
mirror of https://github.com/noisymime/Arduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compiler: merge sketch must look for the bootloader file under runtime.platform.path, not build.platform.path. Fixes #3395

This commit is contained in:
Federico Fissore 2015-06-22 11:50:46 +02:00
parent 7f2fc71607
commit 5d3e4c185e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1203,7 +1203,7 @@ public class Compiler implements MessageConsumer {
bootloaderNoBlink = prefs.get("bootloader.file");
}
File bootloader = new File(new File(prefs.get("build.platform.path"), "bootloaders"), bootloaderNoBlink);
File bootloader = new File(new File(prefs.get("runtime.platform.path"), "bootloaders"), bootloaderNoBlink);
if (!bootloader.exists()) {
System.err.println(I18n.format(_("Bootloader file specified but missing: {0}"), bootloader));
return null;