Skip to content

Commit 5934409

Browse files
committed
Save complete config when closing due to darklaf disabling.
1 parent b2a478f commit 5934409

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

src/java/com/javadeobfuscator/deobfuscator/ui/SwingWindow.java

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ public class SwingWindow
6464
private static JCheckBoxMenuItem enableDarkLaf;
6565
private static final Map<Class<?>, String> TRANSFORMER_TO_NAME = new HashMap<>();
6666
private static final Map<String, Class<?>> NAME_TO_TRANSFORMER = new HashMap<>();
67+
private static DefaultListModel<TransformerWithConfig> transformerSelected;
6768

6869
public static void main(String[] args)
6970
{
@@ -138,8 +139,7 @@ public void actionPerformed(ActionEvent e)
138139
return;
139140
}
140141
GuiConfig.setDarkLaf(false);
141-
GuiConfig.setDarklafSettings(ThemeSettings.getInstance().exportConfiguration());
142-
GuiConfig.save();
142+
writeAndSaveGuiConfig(fields);
143143
System.exit(0);
144144
}
145145
}
@@ -371,7 +371,7 @@ public void actionPerformed(ActionEvent e)
371371
}
372372
//Second list (selected)
373373
JScrollPane transformerSelectedScroll = new JScrollPane();
374-
DefaultListModel<TransformerWithConfig> transformerSelected = new DefaultListModel<>();
374+
transformerSelected = new DefaultListModel<>();
375375
JList<TransformerWithConfig> selectedJList = new JList<>(transformerSelected);
376376
selectedJList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
377377
selectedJList.setModel(transformerSelected);
@@ -1104,17 +1104,22 @@ public void windowClosing(WindowEvent e)
11041104
@Override
11051105
public void windowClosing(WindowEvent e)
11061106
{
1107-
GuiConfig.setLimitConsoleLines(shouldLimitLines.getState());
1108-
GuiConfig.setStoreConfigOnClose(storeConfigOnClose.getState());
1109-
GuiConfig.setConfig(createConfig(fields, transformerSelected));
1110-
GuiConfig.setDarklafSettings(ThemeSettings.getInstance().exportConfiguration());
1111-
GuiConfig.save();
1107+
writeAndSaveGuiConfig(fields);
11121108
}
11131109
});
11141110

11151111
frame.setVisible(true);
11161112
}
11171113

1114+
private static void writeAndSaveGuiConfig(List<ConfigItem> fields)
1115+
{
1116+
GuiConfig.setLimitConsoleLines(shouldLimitLines.getState());
1117+
GuiConfig.setStoreConfigOnClose(storeConfigOnClose.getState());
1118+
GuiConfig.setConfig(createConfig(fields, transformerSelected));
1119+
GuiConfig.setDarklafSettings(ThemeSettings.getInstance().exportConfiguration());
1120+
GuiConfig.save();
1121+
}
1122+
11181123
private static void readAndApplyConfig(List<ConfigItem> fields, DefaultListModel<TransformerWithConfig> transformerSelected, String args1)
11191124
{
11201125
List<String> split = splitQuoteAware(args1, ' ');

0 commit comments

Comments
 (0)