From 4f324f6598f95cec23bf7349249d0020751f8655 Mon Sep 17 00:00:00 2001 From: Agetian Date: Sun, 5 Feb 2017 10:16:47 +0000 Subject: [PATCH] - Make sure the targeting overlay menu is initialized correctly. --- .../src/main/java/forge/screens/match/menus/GameMenu.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/menus/GameMenu.java b/forge-gui-desktop/src/main/java/forge/screens/match/menus/GameMenu.java index 7006327aaf5..b64fefeee31 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/menus/GameMenu.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/menus/GameMenu.java @@ -1,5 +1,6 @@ package forge.screens.match.menus; +import com.google.common.primitives.Ints; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.KeyEvent; @@ -147,6 +148,12 @@ public final class GameMenu { SkinIcon menuIcon = MenuUtil.getMenuIcon(FSkinProp.ICO_ARCSOFF); + if (matchUI.getCDock().getArcState() == null) { + final String arcStateStr = FModel.getPreferences().getPref(FPref.UI_TARGETING_OVERLAY); + final Integer arcState = Ints.tryParse(arcStateStr); + matchUI.getCDock().setArcState(ArcState.values()[arcState == null ? 0 : arcState]); + } + SkinnedRadioButtonMenuItem menuItem; menuItem = getTargetingArcRadioButton("Off", FSkinProp.ICO_ARCSOFF, ArcState.OFF); if (menuItem.isSelected()) { menuIcon = MenuUtil.getMenuIcon(FSkinProp.ICO_ARCSOFF); }