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

Possible fix for strange behaviors in closing win/lose screen.

Browse Source
This commit is contained in:
Doublestrike
2012-05-24 12:54:09 +00:00
parent 63f0ff69c0
commit 32e9ba4bc3
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/forge/gui/match/ControlWinLose.java
View File

@@ -4,6 +4,8 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.util.List; import java.util.List;
import javax.swing.JButton;
import forge.AllZone; import forge.AllZone;
import forge.Card; import forge.Card;
import forge.CardList; import forge.CardList;
@@ -55,6 +57,7 @@ public class ControlWinLose {
@Override @Override
public void actionPerformed(final ActionEvent e) { public void actionPerformed(final ActionEvent e) {
actionOnQuit(); actionOnQuit();
((JButton) e.getSource()).setEnabled(false);
} }
}); });
} }

5
src/main/java/forge/gui/match/controllers/CDock.java
View File

@@ -41,6 +41,7 @@ import forge.gui.SOverlayUtils;
import forge.gui.framework.ICDoc; import forge.gui.framework.ICDoc;
import forge.gui.framework.SLayoutIO; import forge.gui.framework.SLayoutIO;
import forge.gui.match.views.VDock; import forge.gui.match.views.VDock;
import forge.gui.toolbox.FOverlay;
import forge.gui.toolbox.SaveOpenDialog; import forge.gui.toolbox.SaveOpenDialog;
import forge.gui.toolbox.SaveOpenDialog.Filetypes; import forge.gui.toolbox.SaveOpenDialog.Filetypes;
import forge.item.CardPrinted; import forge.item.CardPrinted;
@@ -58,6 +59,10 @@ public enum CDock implements ICDoc {
/** Concede game, bring up WinLose UI. */ /** Concede game, bring up WinLose UI. */
public void concede() { public void concede() {
if (FOverlay.SINGLETON_INSTANCE.getPanel().isShowing()) {
return;
}
AllZone.getHumanPlayer().concede(); AllZone.getHumanPlayer().concede();
Singletons.getModel().getGameAction().checkStateEffects(); Singletons.getModel().getGameAction().checkStateEffects();
} }