Fix for #2543 - Swing components should not be manipulated outside event dispatcher...

svn changeset:6778/svn branch:trunk

diff --git a/src/com/itmill/toolkit/launcher/ITMillToolkitDesktopMode.java b/src/com/itmill/toolkit/launcher/ITMillToolkitDesktopMode.java
index 70623429447ad6b93a0913e9d476369efe72c42a..72aecc4464bf9f158b8d242136fbe25f04ad3d2c 100644 (file)
--- a/src/com/itmill/toolkit/launcher/ITMillToolkitDesktopMode.java
+++ b/src/com/itmill/toolkit/launcher/ITMillToolkitDesktopMode.java
@@ -70,13 +70,21 @@ public class ITMillToolkitDesktopMode {
 
         // Open control dialog
         if (url != null) {
-            try {
-                openServerControlDialog(url);
-            } catch (HeadlessException e) {
-                // nop, starting from console
-            }
-        }
 
+            /*
+             * Swing components should never be manipulated outside the event
+             * dispatch thread.
+             */
+            java.awt.EventQueue.invokeLater(new Runnable() {
+                public void run() {
+                    try {
+                        openServerControlDialog(url);
+                    } catch (HeadlessException e) {
+                        // nop, starting from console
+                    }
+                }
+            });
+        }
     }
 
     /**