github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 19:19:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge

Browse source
This commit is contained in:
BetaSteward 2011-08-30 12:44:18 -04:00
commit 2e9870569f
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Mage.Client/src/main/java/mage/client/game/GamePanel.java
View file

@ -34,6 +34,7 @@
package mage.client.game;
import java.util.logging.Level;
import mage.Constants;
import mage.client.MageFrame;
import mage.client.cards.Cards;
@ -60,6 +61,7 @@ import java.awt.event.MouseEvent;
import java.io.Serializable;
import java.util.*;
import java.util.prefs.Preferences;
import mage.client.components.MageComponents;
/**
*
@ -164,6 +166,12 @@ public class GamePanel extends javax.swing.JPanel {
for (ShowCardsDialog reveal: revealed.values()) {
reveal.hideDialog();
}
try {
Component popupContainer = MageFrame.getUI().getComponent(MageComponents.POPUP_CONTAINER);
popupContainer.setVisible(false);
} catch (InterruptedException ex) {
logger.fatal("popupContainer error:", ex);
}
}
public synchronized void showGame(UUID gameId, UUID playerId) {

2
Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
View file

@ -152,7 +152,7 @@ public class MageActionCallback implements ActionCallback {
public void run() {
ThreadUtils.sleep(700);
if (!popupCard.equals(data.card)) {
if (popupCard == null || !popupCard.equals(data.card)) {
return;
}