Changeset 11898 in josm for trunk

Timestamp:

2017-04-13T20:07:57+02:00 (7 years ago)

Author:

bastiK

Message:

fixed #13100 - NPE on launch

File:

• trunk/src/org/openstreetmap/josm/Main.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -517 +517 @@
 
         // creating toolbar
-        contentPanePrivate.add(toolbar.control, BorderLayout.NORTH);
+        GuiHelper.runInEDTAndWait(() -> contentPanePrivate.add(toolbar.control, BorderLayout.NORTH));
 
         registerActionShortcut(menu.help, Shortcut.registerShortcut("system:help", tr("Help"),
@@ -575 +575 @@
         FeatureAdapter.registerLoggingAdapter(name -> Logging.getLogger());
 
-        new InitializationTask(tr("Updating user interface"), () -> {
+        new InitializationTask(tr("Updating user interface"), () -> GuiHelper.runInEDTAndWait(() -> {
             toolbar.refreshToolbarControl();
             toolbar.control.updateUI();
             contentPanePrivate.updateUI();
-        }).call();
+        })).call();
     }