Don't try automatic resume during upload

facchinm · facchinm · commit 523e7696e834 · 2019-03-07T14:20:29.000+01:00
diff --git a/app/src/processing/app/AbstractMonitor.java b/app/src/processing/app/AbstractMonitor.java
@@ -83,7 +83,7 @@ public void actionPerformed(ActionEvent ae) {
               suspend();
             }
           } else {
-            if (closed) {
+            if (closed && (Editor.avoidMultipleOperations == false)) {
               resume(boardPort);
             }
           }
diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java
@@ -181,7 +181,7 @@ public boolean test(SketchController controller) {
 
   private int numTools = 0;
 
-  public boolean avoidMultipleOperations = false;
+  static public boolean avoidMultipleOperations = false;
 
   private final EditorToolbar toolbar;
   // these menus are shared so that they needn't be rebuilt for all windows

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public void actionPerformed(ActionEvent ae) {`
`83`	`83`	`suspend();`
`84`	`84`	`}`
`85`	`85`	`} else {`
`86`		`- if (closed) {`
	`86`	`+ if (closed && (Editor.avoidMultipleOperations == false)) {`
`87`	`87`	`resume(boardPort);`
`88`	`88`	`}`
`89`	`89`	`}`