Skip to content

Commit 06445dd

Browse files
author
Federico Fissore
committed
Preventing upload and serial monitor on not (yet) available boards
1 parent 9898fd7 commit 06445dd

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

app/src/processing/app/Editor.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2512,6 +2512,12 @@ public void handleSerial() {
25122512
}
25132513

25142514
BoardPort port = Base.getDiscoveryManager().find(Preferences.get("serial.port"));
2515+
2516+
if (port == null) {
2517+
statusError(I18n.format("Board at {0} is not available", Preferences.get("serial.port")));
2518+
return;
2519+
}
2520+
25152521
serialMonitor = new UploaderAndMonitorFactory().newMonitor(port, base);
25162522
serialMonitor.setIconImage(getIconImage());
25172523

app/src/processing/app/Sketch.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1670,6 +1670,11 @@ protected boolean upload(String buildPath, String suggestedClassName, boolean us
16701670

16711671
BoardPort boardPort = Base.getDiscoveryManager().find(Preferences.get("serial.port"));
16721672

1673+
if (boardPort == null) {
1674+
editor.statusError(I18n.format("Board at {0} is not available", Preferences.get("serial.port")));
1675+
return false;
1676+
}
1677+
16731678
Uploader uploader = new UploaderAndMonitorFactory().newUploader(target.getBoards().get(board), boardPort);
16741679

16751680
boolean success = false;

0 commit comments

Comments
 (0)