moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2025-01-08 12:28:04 -05:00
Code Issues Releases Wiki Activity

Keep preferences.backup.xml around for good (not generally necessary, might be really appreciated by the occasional user)

Browse Source
This commit is contained in:
Reinhard Pointner 2019-04-23 03:36:14 +07:00
parent 7fcfe895a7
commit b449bcec3c
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
source/net/filebot/Main.java
View File

@ -80,8 +80,6 @@ public class Main {
if (args.clearUserData()) {
log.info("Reset preferences");
Settings.forPackage(Main.class).clear();
// restore preferences on start if empty (TODO: remove after a few releases)
getPreferencesBackupFile().delete();
}
@ -141,21 +139,6 @@ public class Main {
// GUI mode => start user interface
SwingUtilities.invokeLater(() -> {
// restore preferences on start if empty (TODO: remove after a few releases)
try {
if (Preferences.userNodeForPackage(Main.class).keys().length == 0) {
File f = getPreferencesBackupFile();
if (f.exists()) {
log.fine("Restore user preferences: " + f);
Settings.restore(f);
} else {
log.fine("No user preferences found: " + f);
}
}
} catch (Exception e) {
debug.log(Level.WARNING, "Failed to restore preferences", e);
}
startUserInterface(args);
// run background tasks
@ -191,6 +174,21 @@ public class Main {
}
}
// restore preferences from backup if necessary
try {
if (Preferences.userNodeForPackage(Main.class).keys().length == 0) {
File f = getPreferencesBackupFile();
if (f.exists()) {
log.fine("Restore user preferences: " + f);
Settings.restore(f);
} else {
log.fine("No user preferences found: " + f);
}
}
} catch (Exception e) {
debug.log(Level.WARNING, "Failed to restore preferences", e);
}
// JavaFX is used for ProgressMonitor and GettingStartedDialog
try {
initJavaFX();