If opening serial monitor causes an error, set it closed. Fixes #3268

Federico Fissore · Federico Fissore · commit b77f5f731dcf · 2015-06-01T15:27:14.000+02:00
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);

Original file line number	Diff line number	Diff line change
`@@ -99,8 +99,8 @@ protected void message(char buff[], int n) {`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`public void close() throws Exception {`
	`102`	`+ super.close();`
`102`	`103`	`if (serial != null) {`
`103`		`- super.close();`
`104`	`104`	`int[] location = getPlacement();`
`105`	`105`	`String locationStr = PApplet.join(PApplet.str(location), ",");`
`106`	`106`	`PreferencesData.set("last.serial.location", locationStr);`