From 28052c2b39f70d910ff1634f82670dc10c13d255 Mon Sep 17 00:00:00 2001
From: Jakub Valtar <jakub.valtar@gmail.com>
Date: Sun, 22 Jan 2017 23:24:32 +0100
Subject: [PATCH] Make run button behave

When clicking run button while a sketch is running, it will be activated
again when the sketch is restarted. Previously it got deactivated by the
old sketch runner, because it was quitting after the new sketch runner
started.
---
 java/src/processing/mode/java/JavaEditor.java    |  7 +++++++
 java/src/processing/mode/java/runner/Runner.java | 16 ++++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java
index b08d2bcdd..70364352a 100644
--- a/java/src/processing/mode/java/JavaEditor.java
+++ b/java/src/processing/mode/java/JavaEditor.java
@@ -1170,6 +1170,13 @@ public class JavaEditor extends Editor {
   }
 
 
+  public void onRunnerExiting(Runner runner) {
+    if (this.runtime == runner) {
+      deactivateRun();
+    }
+  }
+
+
 //  /** Toggle a breakpoint on the current line. */
 //  public void toggleBreakpoint() {
 //    toggleBreakpoint(getCurrentLineID().lineIdx());
diff --git a/java/src/processing/mode/java/runner/Runner.java b/java/src/processing/mode/java/runner/Runner.java
index 9d1dad83d..9508e2e17 100644
--- a/java/src/processing/mode/java/runner/Runner.java
+++ b/java/src/processing/mode/java/runner/Runner.java
@@ -24,10 +24,10 @@ package processing.mode.java.runner;
 
 import processing.app.*;
 import processing.app.exec.StreamRedirectThread;
-import processing.app.ui.Editor;
 import processing.core.*;
 import processing.data.StringList;
 import processing.mode.java.JavaBuild;
+import processing.mode.java.JavaEditor;
 
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
@@ -71,7 +71,7 @@ public class Runner implements MessageConsumer {
   protected Thread outThread = null;
 
   protected SketchException exception;
-  protected Editor editor;
+  protected JavaEditor editor;
   protected JavaBuild build;
   protected Process process;
 
@@ -86,8 +86,8 @@ public class Runner implements MessageConsumer {
 
     checkLocalHost();
 
-    if (listener instanceof Editor) {
-      this.editor = (Editor) listener;
+    if (listener instanceof JavaEditor) {
+      this.editor = (JavaEditor) listener;
       sketchErr = editor.getConsole().getErr();
       sketchOut = editor.getConsole().getOut();
     } else {
@@ -610,7 +610,9 @@ public class Runner implements MessageConsumer {
       // or the user manually closes the sketch window.
       // TODO this should be handled better, should it not?
       if (editor != null) {
-        editor.deactivateRun();
+        java.awt.EventQueue.invokeLater(() -> {
+          editor.onRunnerExiting(Runner.this);
+        });
       }
     } catch (InterruptedException exc) {
       // we don't interrupt
@@ -679,7 +681,9 @@ public class Runner implements MessageConsumer {
     handleCommonErrors(exceptionName, message, listener, sketchErr);
 
     if (editor != null) {
-      editor.deactivateRun();
+      java.awt.EventQueue.invokeLater(() -> {
+        editor.onRunnerExiting(Runner.this);
+      });
     }
   }