Don't try automatic resume during upload

carnifexx · Jul 18, 2019 · 99f6043 · 99f6043
1 parent 693498f
commit 99f6043
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/src/processing/app/AbstractMonitor.java b/app/src/processing/app/AbstractMonitor.java
@@ -85,7 +85,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