Commit e76d413

author

Federico Fissore

committed

When build.core is not defined, fall back to "arduino". Fixes #2635

1 parent ff6fb31 commit e76d413Copy full SHA for e76d413

File tree

+10

-2

lines changed

+10

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -688,7 +688,7 @@ static public void onBoardOrPortChange() {`
`688`	`688`	`// Add library folder for the current selected platform`
`689`	`689`	`TargetPlatform targetPlatform = getTargetPlatform();`
`690`	`690`	`if (targetPlatform != null) {`
`691`		`- String core = getBoardPreferences().get("build.core");`
	`691`	`+ String core = getBoardPreferences().get("build.core", "arduino");`
`692`	`692`	`if (core.contains(":")) {`
`693`	`693`	`String referencedCore = core.split(":")[0];`
`694`	`694`	`TargetPlatform referencedPlatform = getTargetPlatform(referencedCore, targetPlatform.getId());`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -426,7 +426,7 @@ private PreferencesMap createBuildPreferences(String _buildPath,`
`426`	`426`	`TargetPlatform targetPlatform = BaseNoGui.getTargetPlatform();`
`427`	`427`	`TargetPlatform corePlatform = null;`
`428`	`428`	`PreferencesMap boardPreferences = BaseNoGui.getBoardPreferences();`
`429`		`- String core = boardPreferences.get("build.core");`
	`429`	`+ String core = boardPreferences.get("build.core", "arduino");`
`430`	`430`	`if (core.contains(":")) {`
`431`	`431`	`String[] split = core.split(":");`
`432`	`432`	`core = split[1];`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -319,4 +319,12 @@ public boolean putBoolean(String key, boolean value) {`
`319`	`319`	`return new Boolean(prev);`
`320`	`320`	`}`
`321`	`321`
	`322`	`+ public String get(String key, String defaultValue) {`
	`323`	`+ String value = get(key);`
	`324`	`+ if (value != null) {`
	`325`	`+ return value;`
	`326`	`+ }`
	`327`	`+ return defaultValue;`
	`328`	`+ }`
	`329`	`+`
`322`	`330`	`}`

Comments

(0)