Changeset 9311 in josm for trunk/src

Timestamp:

2016-01-04T22:43:13+01:00 (9 years ago)

Author:

simon04

Message:

fix #6044 - Do not overwrite preferences_backup when loading preferences fails

File:

• trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -151 +151 @@
 
     /**
+     * Indicates whether {@link #init(boolean)} completed successfully.
+     * Used to decide whether to write backup preference file in {@link #save()}
+     */
+    protected boolean initSuccessful = false;
+
+    /**
      * Interface for a preference value.
      *
@@ -862 +868 @@
 
         // Backup old preferences if there are old preferences
-        if (prefFile.exists()) {
+        if (prefFile.exists() && prefFile.length() > 0 && initSuccessful) {
             Utils.copyFile(prefFile, backupFile);
         }
@@ -921 +927 @@
      */
     public void init(boolean reset) {
+        initSuccessful = false;
         // get the preferences.
         File prefDir = getPreferencesDirectory();
@@ -975 +982 @@
         try {
             load();
+            initSuccessful = true;
         } catch (Exception e) {
             Main.error(e);