From 8f99034a02614ec8f172d95b3932b3247b01ebd9 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Fri, 3 Apr 2020 19:01:03 +0800 Subject: [PATCH] Fix crash --- forge-gui-desktop/src/main/java/forge/control/FControl.java | 5 +++++ forge-gui-desktop/src/main/java/forge/view/Main.java | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/control/FControl.java b/forge-gui-desktop/src/main/java/forge/control/FControl.java index 4f951641eb5..2b29279d4e7 100644 --- a/forge-gui-desktop/src/main/java/forge/control/FControl.java +++ b/forge-gui-desktop/src/main/java/forge/control/FControl.java @@ -40,6 +40,7 @@ import javax.swing.WindowConstants; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; +import forge.GuiBase; import forge.ImageCache; import forge.LobbyPlayer; import forge.Singletons; @@ -219,6 +220,10 @@ public enum FControl implements KeyEventDispatcher { final ForgePreferences prefs = FModel.getPreferences(); + //set ElsaSerializer from preference + boolean propertyConfig = prefs != null && prefs.getPrefBoolean(ForgePreferences.FPref.UI_USE_ELSA); + GuiBase.enablePropertyConfig(propertyConfig); + closeAction = CloseAction.valueOf(prefs.getPref(FPref.UI_CLOSE_ACTION)); final Localizer localizer = Localizer.getInstance(); diff --git a/forge-gui-desktop/src/main/java/forge/view/Main.java b/forge-gui-desktop/src/main/java/forge/view/Main.java index 27ded0eeb32..0bcdf758ab0 100644 --- a/forge-gui-desktop/src/main/java/forge/view/Main.java +++ b/forge-gui-desktop/src/main/java/forge/view/Main.java @@ -51,9 +51,6 @@ public final class Main { //setup GUI interface GuiBase.setInterface(new GuiDesktop()); - //set ElsaSerializer from preference - GuiBase.enablePropertyConfig(FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.UI_USE_ELSA)); - //install our error handler ExceptionHandler.registerErrorHandling();