Changeset 13396 in josm for trunk/src/org

Timestamp:

2018-02-09T23:09:38+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #15899 - fix JOSM initialization sequence leading to NPE on Windows when calling --help

File:

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

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

@@ -889 +889 @@
         Main.platform.preStartupHook();
 
+        Config.setPreferencesInstance(Main.pref);
+        Config.setBaseDirectoriesProvider(JosmBaseDirectories.getInstance());
+
         if (args.showVersion()) {
             System.out.println(Version.getInstance().getAgentString());
@@ -908 +911 @@
         }
 
-        Config.setPreferencesInstance(Main.pref);
-        Config.setBaseDirectoriesProvider(JosmBaseDirectories.getInstance());
         Main.pref.init(args.hasOption(Option.RESET_PREFERENCES));