Commit 76dfd0a

authored

Merge pull request #10922 from matthijskooijman/fix-no-board-null-pointer

rebuildProgrammerMenu: Handle no current board

2 parents a056a5f + 61e12d5 commit 76dfd0aCopy full SHA for 76dfd0a

File tree

1 file changed

+12

-10

lines changed

app/src/processing/app
- Base.java

1 file changed

+12

-10

lines changed

`‎app/src/processing/app/Base.java‎`

Lines changed: 12 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -1702,18 +1702,20 @@ public void rebuildProgrammerMenu() {`
`1702`	`1702`	`ButtonGroup group = new ButtonGroup();`
`1703`	`1703`
`1704`	`1704`	`TargetBoard board = BaseNoGui.getTargetBoard();`
`1705`		`- TargetPlatform boardPlatform = board.getContainerPlatform();`
`1706`		`- TargetPlatform corePlatform = null;`
	`1705`	`+ if (board != null) {`
	`1706`	`+ TargetPlatform boardPlatform = board.getContainerPlatform();`
	`1707`	`+ TargetPlatform corePlatform = null;`
`1707`	`1708`
`1708`		`- String core = board.getPreferences().get("build.core");`
`1709`		`- if (core != null && core.contains(":")) {`
`1710`		`- String[] split = core.split(":", 2);`
`1711`		`- corePlatform = BaseNoGui.getCurrentTargetPlatformFromPackage(split[0]);`
`1712`		`- }`
	`1709`	`+ String core = board.getPreferences().get("build.core");`
	`1710`	`+ if (core != null && core.contains(":")) {`
	`1711`	`+ String[] split = core.split(":", 2);`
	`1712`	`+ corePlatform = BaseNoGui.getCurrentTargetPlatformFromPackage(split[0]);`
	`1713`	`+ }`
`1713`	`1714`
`1714`		`- addProgrammersForPlatform(boardPlatform, programmerMenus, group);`
`1715`		`- if (corePlatform != null)`
`1716`		`- addProgrammersForPlatform(corePlatform, programmerMenus, group);`
	`1715`	`+ addProgrammersForPlatform(boardPlatform, programmerMenus, group);`
	`1716`	`+ if (corePlatform != null)`
	`1717`	`+ addProgrammersForPlatform(corePlatform, programmerMenus, group);`
	`1718`	`+ }`
`1717`	`1719`
`1718`	`1720`	`if (programmerMenus.isEmpty()) {`
`1719`	`1721`	`JMenuItem item = new JMenuItem(tr("No programmers available for this board"));`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 76dfd0a

File tree

1 file changed

1 file changed

`‎app/src/processing/app/Base.java‎`

0 commit comments