don't complain about preferences.old if preferences.txt did not exist already

benfry · benfry · commit a72d15cd49dc · 2016-08-18T10:00:50.000-04:00
diff --git a/app/src/processing/app/Preferences.java b/app/src/processing/app/Preferences.java
@@ -233,10 +233,10 @@ static public void save() {
             throw new IOException("Could not delete preferences.old");
           }
         }
-        if (!preferencesFile.renameTo(oldPreferences)) {
+        if (preferencesFile.exists() &&
+            !preferencesFile.renameTo(oldPreferences)) {
           throw new IOException("Could not replace preferences.old");
         }
-
         // Make the temporary file into the real preferences
         if (!preferencesTemp.renameTo(preferencesFile)) {
           throw new IOException("Could not move preferences file into place");
diff --git a/todo.txt b/todo.txt
@@ -1,6 +1,6 @@
 0253 (3.2.1)
-_ “Could not replace preferences.old” error message
-_   https://github.com/processing/processing/issues/4626
+X “Could not replace preferences.old” error message
+X   https://github.com/processing/processing/issues/4626
 _ 3.2 not starting up on Windows 10 (64-bit)
 _   https://github.com/processing/processing/issues/4623
 

Original file line number	Diff line number	Diff line change
`@@ -233,10 +233,10 @@ static public void save() {`
`233`	`233`	`throw new IOException("Could not delete preferences.old");`
`234`	`234`	`}`
`235`	`235`	`}`
`236`		`- if (!preferencesFile.renameTo(oldPreferences)) {`
	`236`	`+ if (preferencesFile.exists() &&`
	`237`	`+ !preferencesFile.renameTo(oldPreferences)) {`
`237`	`238`	`throw new IOException("Could not replace preferences.old");`
`238`	`239`	`}`
`239`		`-`
`240`	`240`	`// Make the temporary file into the real preferences`
`241`	`241`	`if (!preferencesTemp.renameTo(preferencesFile)) {`
`242`	`242`	`throw new IOException("Could not move preferences file into place");`