fix swing deadlock issue: #3928

galsasson · galsasson · commit aa90fa8af5f3 · 2015-10-18T01:11:37.000-04:00
diff --git a/java/src/processing/mode/java/JavaMode.java b/java/src/processing/mode/java/JavaMode.java
@@ -35,6 +35,8 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import javax.swing.SwingUtilities;
+
 import processing.app.*;
 import processing.app.ui.Editor;
 import processing.app.ui.EditorException;
@@ -216,17 +218,27 @@ public void run() {
 //          }
           // next lines are executed when the sketch quits
           if (launchInteractive) {
-            editor.initEditorCode(parser.allHandles, false);
-            editor.stopTweakMode(parser.allHandles);
+            // fix swing deadlock issue: https://github.com/processing/processing/issues/3928
+            SwingUtilities.invokeLater(new Runnable() {
+              public void run() {
+                editor.initEditorCode(parser.allHandles, false);
+                editor.stopTweakMode(parser.allHandles);
+              }
+            });
           }
         }
       }).start();
 
       if (launchInteractive) {
-        // replace editor code with baseCode
-        editor.initEditorCode(parser.allHandles, false);
-        editor.updateInterface(parser.allHandles, parser.colorBoxes);
-        editor.startTweakMode();
+        // fix swing deadlock issue: https://github.com/processing/processing/issues/3928
+        SwingUtilities.invokeLater(new Runnable() {
+          public void run() {
+            // replace editor code with baseCode
+            editor.initEditorCode(parser.allHandles, false);
+            editor.updateInterface(parser.allHandles, parser.colorBoxes);
+            editor.startTweakMode();
+          }
+        });
       }
       return runtime;
     }
