Changeset 442 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2007-10-30T13:53:42+01:00 (19 years ago)

Author:

gebner

Message:

Don't reset prefs to default when encountering parsing errors.

File:

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

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

@@ -101 +101 @@
                 if (!prefDir.exists())
                         prefDir.mkdirs();
+
+                if (!new File(Main.pref.getPreferencesDir()+"preferences").exists()) {
+                        Main.pref.resetToDefault();
+                }
+
                 try {
                         if (args.containsKey("reset-preferences")) {
@@ -109 +114 @@
                 } catch (final IOException e1) {
                         e1.printStackTrace();
-                        JOptionPane.showMessageDialog(null, "Preferences could not be loaded. Writing default preference file to "+pref.getPreferencesDir()+"preferences");
-                        Main.pref.resetToDefault();
+                        String backup = Main.pref.getPreferencesDir() + "preferences.bak";
+                        JOptionPane.showMessageDialog(null, "Preferences file had errors.  Making backup of old one to " + backup);
+                        new File(Main.pref.getPreferencesDir() + "preferences").renameTo(new File(backup));
+                        Main.pref.save();
                 }