Commit d0d9aa8

committed

Merge pull request #3017 from cmaglie/programmer-pref-override

programmer.txt definitions must have priority over platforms.txt tools definitions

2 parents 70eaa47 + a7e6a39 commit d0d9aa8Copy full SHA for d0d9aa8

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -253,8 +253,8 @@ public boolean uploadUsingProgrammer(String buildPath, String className) throws`
`253`	`253`	`if (programmerPrefs == null)`
`254`	`254`	`throw new RunnerException(`
`255`	`255`	`_("Please select a programmer from Tools->Programmer menu"));`
	`256`	`+ prefs.putAll(targetPlatform.getTool(programmerPrefs.getOrExcept("program.tool")));`
`256`	`257`	`prefs.putAll(programmerPrefs);`
`257`		`- prefs.putAll(targetPlatform.getTool(prefs.getOrExcept("program.tool")));`
`258`	`258`
`259`	`259`	`prefs.put("build.path", buildPath);`
`260`	`260`	`prefs.put("build.project_name", className);`

Comments

(0)