- Timestamp:
- 2016-01-01T14:55:14+01:00 (9 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/Main.java
r9222 r9238 1083 1083 ImageProvider.shutdown(false); 1084 1084 JCSCacheManager.shutdown(); 1085 geometry.remember("gui.geometry"); 1085 if (geometry != null) { 1086 geometry.remember("gui.geometry"); 1087 } 1086 1088 if (map != null) { 1087 1089 map.rememberToggleDialogWidth(); -
trunk/src/org/openstreetmap/josm/actions/RestartAction.java
r8846 r9238 46 46 putValue("help", ht("/Action/Restart")); 47 47 putValue("toolbar", "action/restart"); 48 Main.toolbar.register(this); 48 if (Main.toolbar != null) { 49 Main.toolbar.register(this); 50 } 49 51 setEnabled(isRestartSupported()); 50 52 } -
trunk/src/org/openstreetmap/josm/gui/MainApplication.java
r9171 r9238 4 4 import static org.openstreetmap.josm.tools.I18n.tr; 5 5 import static org.openstreetmap.josm.tools.I18n.trn; 6 import gnu.getopt.Getopt; 7 import gnu.getopt.LongOpt; 6 8 7 9 import java.awt.Dimension; … … 48 50 import org.openstreetmap.josm.Main; 49 51 import org.openstreetmap.josm.actions.PreferencesAction; 52 import org.openstreetmap.josm.actions.RestartAction; 50 53 import org.openstreetmap.josm.data.AutosaveTask; 51 54 import org.openstreetmap.josm.data.CustomConfigurator; … … 71 74 import org.openstreetmap.josm.tools.PlatformHookWindows; 72 75 import org.openstreetmap.josm.tools.Utils; 73 74 import gnu.getopt.Getopt;75 import gnu.getopt.LongOpt;76 76 77 77 /** … … 583 583 if (wasv6 && !hasv6) { 584 584 Main.info(tr("Detected no useable IPv6 network, prefering IPv4 over IPv6 after next restart.")); 585 Main.pref.put("validated.ipv6", hasv6); // be sure it is stored before the restart! 586 new RestartAction().actionPerformed(null); 585 587 } 586 588 Main.pref.put("validated.ipv6", hasv6);
Note:
See TracChangeset
for help on using the changeset viewer.