From 32e9ba4bc3d4d7c532e84a001f9937badde3d4d3 Mon Sep 17 00:00:00 2001 From: Doublestrike Date: Thu, 24 May 2012 12:54:09 +0000 Subject: [PATCH] Possible fix for strange behaviors in closing win/lose screen. --- src/main/java/forge/gui/match/ControlWinLose.java | 3 +++ src/main/java/forge/gui/match/controllers/CDock.java | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/forge/gui/match/ControlWinLose.java b/src/main/java/forge/gui/match/ControlWinLose.java index 6784a35ed66..97915f1eec2 100644 --- a/src/main/java/forge/gui/match/ControlWinLose.java +++ b/src/main/java/forge/gui/match/ControlWinLose.java @@ -4,6 +4,8 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.List; +import javax.swing.JButton; + import forge.AllZone; import forge.Card; import forge.CardList; @@ -55,6 +57,7 @@ public class ControlWinLose { @Override public void actionPerformed(final ActionEvent e) { actionOnQuit(); + ((JButton) e.getSource()).setEnabled(false); } }); } diff --git a/src/main/java/forge/gui/match/controllers/CDock.java b/src/main/java/forge/gui/match/controllers/CDock.java index a995809ab71..379186d4506 100644 --- a/src/main/java/forge/gui/match/controllers/CDock.java +++ b/src/main/java/forge/gui/match/controllers/CDock.java @@ -41,6 +41,7 @@ import forge.gui.SOverlayUtils; import forge.gui.framework.ICDoc; import forge.gui.framework.SLayoutIO; import forge.gui.match.views.VDock; +import forge.gui.toolbox.FOverlay; import forge.gui.toolbox.SaveOpenDialog; import forge.gui.toolbox.SaveOpenDialog.Filetypes; import forge.item.CardPrinted; @@ -58,6 +59,10 @@ public enum CDock implements ICDoc { /** Concede game, bring up WinLose UI. */ public void concede() { + if (FOverlay.SINGLETON_INSTANCE.getPanel().isShowing()) { + return; + } + AllZone.getHumanPlayer().concede(); Singletons.getModel().getGameAction().checkStateEffects(); }