Changeset 9238 in josm for trunk/src

Timestamp:

2016-01-01T14:55:14+01:00 (8 years ago)

Author:

stoecker

Message:

see #8562 - restart JOSM in case we switched from IPv6 to IPv4 only, so we have no broken connection

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (1 diff)
• actions/RestartAction.java (modified) (1 diff)
• gui/MainApplication.java (modified) (4 diffs)

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

@@ -1083 +1083 @@
             ImageProvider.shutdown(false);
             JCSCacheManager.shutdown();
-            geometry.remember("gui.geometry");
+            if (geometry != null) {
+                geometry.remember("gui.geometry");
+            }
             if (map != null) {
                 map.rememberToggleDialogWidth();

trunk/src/org/openstreetmap/josm/actions/RestartAction.java

@@ -46 +46 @@
         putValue("help", ht("/Action/Restart"));
         putValue("toolbar", "action/restart");
-        Main.toolbar.register(this);
+        if (Main.toolbar != null) {
+            Main.toolbar.register(this);
+        }
         setEnabled(isRestartSupported());
     }

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trn;
+import gnu.getopt.Getopt;
+import gnu.getopt.LongOpt;
 
 import java.awt.Dimension;
@@ -48 +50 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.PreferencesAction;
+import org.openstreetmap.josm.actions.RestartAction;
 import org.openstreetmap.josm.data.AutosaveTask;
 import org.openstreetmap.josm.data.CustomConfigurator;
@@ -71 +74 @@
 import org.openstreetmap.josm.tools.PlatformHookWindows;
 import org.openstreetmap.josm.tools.Utils;
-
-import gnu.getopt.Getopt;
-import gnu.getopt.LongOpt;
 
 /**
@@ -583 +583 @@
                     if (wasv6 && !hasv6) {
                         Main.info(tr("Detected no useable IPv6 network, prefering IPv4 over IPv6 after next restart."));
+                        Main.pref.put("validated.ipv6", hasv6); // be sure it is stored before the restart!
+                        new RestartAction().actionPerformed(null);
                     }
                     Main.pref.put("validated.ipv6", hasv6);