Changeset 10387 in josm for trunk

Timestamp:

2016-06-15T17:33:14+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #12970 - NPE in Main.exitJosm when a restart occurs during IPv6 check

File:

• trunk/src/org/openstreetmap/josm/Main.java (modified) (1 diff)

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

@@ -1108 +1108 @@
     public static boolean exitJosm(boolean exit, int exitCode) {
         if (Main.saveUnsavedModifications()) {
-            Main.main.shutdown();
+            if (Main.main != null) {
+                Main.main.shutdown();
+            }
 
             if (exit) {