rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-03-21 12:29:23 +01:00
Code Issues Releases Activity

Avoid NPE and spurious unlock if serial monitor is clicked at upload warmup

Browse Source
This commit is contained in:
Martino Facchin 2019-07-22 14:50:10 +02:00
parent 13b74f5ccb
commit b2235c3a4a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/processing/app/Base.java
View File

@ -1927,7 +1927,9 @@ public class Base {
this.handleFontSizeChange(-1);
}
} else {
e.getComponent().getParent().dispatchEvent(e);
if (e.getComponent() != null && e.getComponent().getParent() != null) {
e.getComponent().getParent().dispatchEvent(e);
}
}
});
}

4
app/src/processing/app/Editor.java
View File

@ -2060,6 +2060,8 @@ public class Editor extends JFrame implements RunnerListener {
public void run() {
try {
uploading = true;
removeAllLineHighlights();
if (serialMonitor != null) {
serialMonitor.suspend();
@ -2068,8 +2070,6 @@ public class Editor extends JFrame implements RunnerListener {
serialPlotter.suspend();
}
uploading = true;
boolean success = sketchController.exportApplet(usingProgrammer);
if (success) {
statusNotice(tr("Done uploading."));