Changeset 5796 in josm for trunk/src/org/openstreetmap/josm/gui/MainApplication.java

Timestamp:

2013-03-22T22:44:52+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #8533 - AWT dead lock when hiding splash screen and opening main window (patch by kendzi)

File:

• trunk/src/org/openstreetmap/josm/gui/MainApplication.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -41 +41 @@
 import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.DefaultProxySelector;
 import org.openstreetmap.josm.io.auth.CredentialsManager;
@@ -280 +281 @@
         Main.pref.updateSystemProperties();
 
-        JFrame mainFrame = new JFrame(tr("Java OpenStreetMap Editor"));
+        final JFrame mainFrame = new JFrame(tr("Java OpenStreetMap Editor"));
         Main.parent = mainFrame;
 
@@ -314 +315 @@
         }
 
-        SplashScreen splash = new SplashScreen();
+        final SplashScreen splash = new SplashScreen();
         final ProgressMonitor monitor = splash.getProgressMonitor();
         monitor.beginTask(tr("Initializing"));
@@ -348 +349 @@
         PluginHandler.loadLatePlugins(splash,pluginsToLoad,  monitor.createSubTaskMonitor(1, false));
         toolbar.refreshToolbarControl();
-        splash.setVisible(false);
-        splash.dispose();
-        mainFrame.setVisible(true);
+
+        GuiHelper.runInEDT(new Runnable() {
+            public void run() {
+                splash.setVisible(false);
+                splash.dispose();
+                mainFrame.setVisible(true);
+            }
+        });
+
         Main.MasterWindowListener.setup();