Skip to content

Commit

Permalink
Update Luyten for Procyon
Browse files Browse the repository at this point in the history
  • Loading branch information
dstmath authored and deathmarine committed Dec 28, 2015
1 parent bd8fe23 commit 20eafd2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/us/deathmarine/luyten/ConfigSaver.java
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ public static ConfigSaver getLoadedInstance() {
*/
private void loadConfig() {
decompilerSettings = new DecompilerSettings();
if (decompilerSettings.getFormattingOptions() == null) {
decompilerSettings.setFormattingOptions(JavaFormattingOptions.createDefault());
if (decompilerSettings.getJavaFormattingOptions() == null) {
decompilerSettings.setJavaFormattingOptions(JavaFormattingOptions.createDefault());
}
luytenPreferences = new LuytenPreferences();
mainWindowPosition = new WindowPosition();
Expand Down
4 changes: 2 additions & 2 deletions src/us/deathmarine/luyten/FileSaver.java
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,8 @@ private void doSaveUnknownFile(File inFile, File outFile) throws Exception {
private DecompilerSettings cloneSettings() {
DecompilerSettings settings = ConfigSaver.getLoadedInstance().getDecompilerSettings();
DecompilerSettings newSettings = new DecompilerSettings();
if (newSettings.getFormattingOptions() == null) {
newSettings.setFormattingOptions(JavaFormattingOptions.createDefault());
if (newSettings.getJavaFormattingOptions() == null) {
newSettings.setJavaFormattingOptions(JavaFormattingOptions.createDefault());
}
// synchronized: against main menu changes
synchronized (settings) {
Expand Down

0 comments on commit 20eafd2

Please sign in to comment.