fix(gui): on settings reset run upgrade method
This commit is contained in:
@@ -47,7 +47,10 @@ public class JadxSettings extends JadxCLIArgs {
|
||||
|
||||
private Map<String, WindowLocation> windowPos = new HashMap<>();
|
||||
|
||||
public JadxSettings() {
|
||||
public static JadxSettings makeDefault() {
|
||||
JadxSettings jadxSettings = new JadxSettings();
|
||||
jadxSettings.fixOnLoad();
|
||||
return jadxSettings;
|
||||
}
|
||||
|
||||
public void sync() {
|
||||
|
||||
@@ -46,10 +46,13 @@ public class JadxSettingsAdapter {
|
||||
JadxSettings settings = fromString(jsonSettings);
|
||||
if (settings == null) {
|
||||
LOG.debug("Created new settings.");
|
||||
settings = new JadxSettings();
|
||||
settings = JadxSettings.makeDefault();
|
||||
} else {
|
||||
settings.fixOnLoad();
|
||||
}
|
||||
if (LOG.isDebugEnabled()) {
|
||||
LOG.debug("Loaded settings: {}", makeString(settings));
|
||||
}
|
||||
settings.fixOnLoad();
|
||||
LOG.debug("Loaded settings: {}", makeString(settings));
|
||||
return settings;
|
||||
} catch (Exception e) {
|
||||
LOG.error("Error load settings", e);
|
||||
|
||||
@@ -12,8 +12,8 @@ import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import say.swing.JFontChooser;
|
||||
|
||||
import jadx.gui.ui.codearea.EditorTheme;
|
||||
import jadx.gui.ui.MainWindow;
|
||||
import jadx.gui.ui.codearea.EditorTheme;
|
||||
import jadx.gui.utils.LangLocale;
|
||||
import jadx.gui.utils.NLS;
|
||||
|
||||
@@ -94,7 +94,7 @@ public class JadxSettingsWindow extends JDialog {
|
||||
NLS.str("preferences.reset_title"),
|
||||
JOptionPane.YES_NO_OPTION);
|
||||
if (res == JOptionPane.YES_OPTION) {
|
||||
String defaults = JadxSettingsAdapter.makeString(new JadxSettings());
|
||||
String defaults = JadxSettingsAdapter.makeString(JadxSettings.makeDefault());
|
||||
JadxSettingsAdapter.fill(settings, defaults);
|
||||
getContentPane().removeAll();
|
||||
initUI();
|
||||
|
||||
Reference in New Issue
Block a user