From 99f6043ced4275bbaad7a21c74930387387b5ddc Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Tue, 9 Oct 2018 17:25:07 +0200
Subject: [PATCH] Don't try automatic resume during upload

---
 app/src/processing/app/AbstractMonitor.java | 2 +-
 app/src/processing/app/Editor.java          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/processing/app/AbstractMonitor.java b/app/src/processing/app/AbstractMonitor.java
index ad1ed87eb..4fb819a73 100644
--- a/app/src/processing/app/AbstractMonitor.java
+++ b/app/src/processing/app/AbstractMonitor.java
@@ -85,7 +85,7 @@ public abstract class AbstractMonitor extends JFrame implements ActionListener {
               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
index 8ed2ccc73..a8e5b7b74 100644
--- a/app/src/processing/app/Editor.java
+++ b/app/src/processing/app/Editor.java
@@ -181,7 +181,7 @@ public class Editor extends JFrame implements RunnerListener {
 
   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