Changeset 13396 in josm


Ignore:
Timestamp:
2018-02-09T23:09:38+01:00 (11 days ago)
Author:
Don-vip
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/MainApplication.java

    r13356 r13396  
    889889        Main.platform.preStartupHook();
    890890
     891        Config.setPreferencesInstance(Main.pref);
     892        Config.setBaseDirectoriesProvider(JosmBaseDirectories.getInstance());
     893
    891894        if (args.showVersion()) {
    892895            System.out.println(Version.getInstance().getAgentString());
     
    908911        }
    909912
    910         Config.setPreferencesInstance(Main.pref);
    911         Config.setBaseDirectoriesProvider(JosmBaseDirectories.getInstance());
    912913        Main.pref.init(args.hasOption(Option.RESET_PREFERENCES));
    913914
Note: See TracChangeset for help on using the changeset viewer.