From ad38b7d7967a5c4b46858143fb913ca889746c43 Mon Sep 17 00:00:00 2001
From: Ben Fry <fry@processing.org>
Date: Sun, 3 Feb 2013 11:29:58 -0500
Subject: [PATCH] add patch for Play Button not working (issue #688)

---
 app/src/processing/app/EditorToolbar.java    | 11 ++++++-----
 app/src/processing/mode/java/JavaEditor.java |  6 ++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/src/processing/app/EditorToolbar.java b/app/src/processing/app/EditorToolbar.java
index 1855dfe42..d77f8ff97 100644
--- a/app/src/processing/app/EditorToolbar.java
+++ b/app/src/processing/app/EditorToolbar.java
@@ -310,7 +310,6 @@ public abstract class EditorToolbar extends JComponent implements MouseInputList
     int x = e.getX();
     int y = e.getY();
 
-    //      if (currentRollover != -1) {
     if (rollover != null) {
       //        if ((x > x1[currentRollover]) && (y > y1) &&
       //            (x < x2[currentRollover]) && (y < y2)) {
@@ -319,9 +318,9 @@ public abstract class EditorToolbar extends JComponent implements MouseInputList
         return;
 
       } else {
-        //          setState(currentRollover, INACTIVE, true);
-        rollover.setState(INACTIVE, true);
-        //          currentRollover = -1;
+        if (rollover.state == ROLLOVER) {
+          rollover.setState(INACTIVE, true);
+        }
         rollover = null;
       }
     }
@@ -429,7 +428,9 @@ public abstract class EditorToolbar extends JComponent implements MouseInputList
     // there is no more rollover, make sure that the rollover text goes away
 //    currentRollover = -1;
     if (rollover != null) {
-      rollover.setState(INACTIVE, true);
+      if (rollover.state == ROLLOVER) {
+        rollover.setState(INACTIVE, true);
+      }
       rollover = null;
     }
   }
diff --git a/app/src/processing/mode/java/JavaEditor.java b/app/src/processing/mode/java/JavaEditor.java
index 2390570f1..1b576e447 100644
--- a/app/src/processing/mode/java/JavaEditor.java
+++ b/app/src/processing/mode/java/JavaEditor.java
@@ -464,12 +464,11 @@ public class JavaEditor extends Editor {
 
 
   public void handleRun() {
-    toolbar.activate(JavaToolbar.RUN);
-
     new Thread(new Runnable() {
       public void run() {
         prepareRun();
         try {
+          toolbar.activate(JavaToolbar.RUN);
           runtime = jmode.handleRun(sketch, JavaEditor.this);
 //          System.out.println("runtime now " + runtime);
         } catch (Exception e) {
@@ -481,12 +480,11 @@ public class JavaEditor extends Editor {
 
 
   public void handlePresent() {
-    toolbar.activate(JavaToolbar.RUN);
-
     new Thread(new Runnable() {
       public void run() {
         prepareRun();
         try {
+          toolbar.activate(JavaToolbar.RUN);
           runtime = jmode.handlePresent(sketch, JavaEditor.this);
         } catch (Exception e) {
           statusError(e);