Changeset 11898 in josm


Ignore:
Timestamp:
2017-04-13T20:07:57+02:00 (8 months ago)
Author:
bastiK
Message:

fixed #13100 - NPE on launch

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/Main.java

    r11713 r11898  
    517517
    518518        // creating toolbar
    519         contentPanePrivate.add(toolbar.control, BorderLayout.NORTH);
     519        GuiHelper.runInEDTAndWait(() -> contentPanePrivate.add(toolbar.control, BorderLayout.NORTH));
    520520
    521521        registerActionShortcut(menu.help, Shortcut.registerShortcut("system:help", tr("Help"),
     
    575575        FeatureAdapter.registerLoggingAdapter(name -> Logging.getLogger());
    576576
    577         new InitializationTask(tr("Updating user interface"), () -> {
     577        new InitializationTask(tr("Updating user interface"), () -> GuiHelper.runInEDTAndWait(() -> {
    578578            toolbar.refreshToolbarControl();
    579579            toolbar.control.updateUI();
    580580            contentPanePrivate.updateUI();
    581         }).call();
     581        })).call();
    582582    }
    583583
Note: See TracChangeset for help on using the changeset viewer.