Commit 4ccf9bb

PaulStoffregencmaglie

authored and

committed

Show a helpful message when no Port is selected

1 parent 5f9ff25 commit 4ccf9bbCopy full SHA for 4ccf9bb

File tree

+14

-1

lines changed

+14

-1

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -709,6 +709,10 @@ private boolean upload(String suggestedClassName, boolean usingProgrammer) throw`
`709`	`709`
`710`	`710`	`UploaderUtils uploaderInstance = new UploaderUtils();`
`711`	`711`	`Uploader uploader = uploaderInstance.getUploaderByPreferences(false);`
	`712`	`+ if (uploader == null) {`
	`713`	`+ editor.statusError(tr("Please select a Port before Upload"));`
	`714`	`+ return false;`
	`715`	`+ }`
`712`	`716`
`713`	`717`	`EditorConsole.setCurrentEditorConsole(editor.console);`
`714`	`718`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,16 @@ public Uploader getUploaderByPreferences(boolean noUploadPort) {`
`50`	`50`
`51`	`51`	`BoardPort boardPort = null;`
`52`	`52`	`if (!noUploadPort) {`
`53`		`- boardPort = BaseNoGui.getDiscoveryManager().find(PreferencesData.get("serial.port"));`
	`53`	`+ String port = PreferencesData.get("serial.port");`
	`54`	`+ if (port == null \|\| port.isEmpty()) {`
	`55`	`+ return null;`
	`56`	`+ }`
	`57`	`+ boardPort = BaseNoGui.getDiscoveryManager().find(port);`
	`58`	`+ //if (boardPort == null) {`
	`59`	`+ // Is there ever a reason to attempt upload when`
	`60`	`+ // the Port is not found by DiscoveryManager?`
	`61`	`+ //return null;`
	`62`	`+ //}`
`54`	`63`	`}`
`55`	`64`
`56`	`65`	`return new UploaderFactory().newUploader(target.getBoards().get(board), boardPort, noUploadPort);`

Comments

(0)