If opening serial monitor causes an error, set it closed. Fixes esp82…

…66#3268
tpolyphet · Jun 1, 2015 · b77f5f7 · b77f5f7
1 parent a859cfb
commit b77f5f7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java
@@ -2727,6 +2727,11 @@ public void handleSerial() {
           errorMessage += " (" + ((SerialPortException) e.getCause()).getExceptionType() + ")";
         }
         statusError(errorMessage);
+        try {
+          serialMonitor.close();
+        } catch (Exception e1) {
+          // noop
+        }
       } catch (Exception e) {
         statusError(e);
       } finally {

diff --git a/app/src/processing/app/SerialMonitor.java b/app/src/processing/app/SerialMonitor.java
@@ -99,8 +99,8 @@ protected void message(char buff[], int n) {
   }
 
   public void close() throws Exception {
+    super.close();
     if (serial != null) {
-      super.close();
       int[] location = getPlacement();
       String locationStr = PApplet.join(PApplet.str(location), ",");
       PreferencesData.set("last.serial.location", locationStr);