Changeset 13960 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2018-06-20T18:00:26+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16410 - NPE

File:

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

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

@@ -1028 +1028 @@
 
         final SplashScreen splash = GuiHelper.runInEDTAndWaitAndReturn(SplashScreen::new);
-        final SplashScreen.SplashProgressMonitor monitor = splash.getProgressMonitor();
+        // splash can be null sometimes on Linux, in this case try to load JOSM silently
+        final SplashProgressMonitor monitor = splash != null ? splash.getProgressMonitor() : new SplashProgressMonitor(null, e -> {
+            Logging.debug(e.toString());
+        });
         monitor.beginTask(tr("Initializing"));
-        GuiHelper.runInEDT(() -> splash.setVisible(Config.getPref().getBoolean("draw.splashscreen", true)));
+        if (splash != null) {
+            GuiHelper.runInEDT(() -> splash.setVisible(Config.getPref().getBoolean("draw.splashscreen", true)));
+        }
         Main.setInitStatusListener(new InitStatusListener() {
 
@@ -1071 +1076 @@
         // Wait for splash disappearance (fix #9714)
         GuiHelper.runInEDTAndWait(() -> {
-            splash.setVisible(false);
-            splash.dispose();
+            if (splash != null) {
+                splash.setVisible(false);
+                splash.dispose();
+            }
             mainFrame.setVisible(true);
         });