Ticket #3439: unbreak-language.patch

File unbreak-language.patch, 961 bytes (added by avarab@…, 17 years ago)

Load preferences and *then* do Main.pref.get()

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

     
    8686            args.put(key, v);
    8787        }
    8888
     89        Main.pref.init(args.containsKey("reset-preferences"));
     90
    8991        // Check if passed as parameter
    9092        if (args.containsKey("language")) {
    9193            I18n.set((String)(args.get("language").toArray()[0]));
     
    9395            I18n.set(Main.pref.get("language", null));
    9496        }
    9597
    96         Main.pref.init(args.containsKey("reset-preferences"));
    9798
    98 
    9999        if (argList.contains("--help") || argList.contains("-?") || argList.contains("-h")) {
    100100            // TODO: put in a platformHook for system that have no console by default
    101101            System.out.println(tr("Java OpenStreetMap Editor")+"\n\n"+