external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash

Browse Source
This commit is contained in:
Anthony Calosa
2020-04-03 19:01:03 +08:00
parent d66700cbf3
commit 8f99034a02
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-gui-desktop/src/main/java/forge/control/FControl.java
View File

@@ -40,6 +40,7 @@ import javax.swing.WindowConstants;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import forge.GuiBase;
import forge.ImageCache; import forge.ImageCache;
import forge.LobbyPlayer; import forge.LobbyPlayer;
import forge.Singletons; import forge.Singletons;
@@ -219,6 +220,10 @@ public enum FControl implements KeyEventDispatcher {
final ForgePreferences prefs = FModel.getPreferences(); 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)); closeAction = CloseAction.valueOf(prefs.getPref(FPref.UI_CLOSE_ACTION));
final Localizer localizer = Localizer.getInstance(); final Localizer localizer = Localizer.getInstance();

3
forge-gui-desktop/src/main/java/forge/view/Main.java
View File

@@ -51,9 +51,6 @@ public final class Main {
//setup GUI interface //setup GUI interface
GuiBase.setInterface(new GuiDesktop()); GuiBase.setInterface(new GuiDesktop());
//set ElsaSerializer from preference
GuiBase.enablePropertyConfig(FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.UI_USE_ELSA));
//install our error handler //install our error handler
ExceptionHandler.registerErrorHandling(); ExceptionHandler.registerErrorHandling();