External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 04:52:07 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed a bug that froze the game if you finished a game, pushed ok and directly started to open a new game. The FeedbackPanel.endWithTimeout() task triggered after 8 seconds and locked the client.

Browse source
This commit is contained in:
LevelX2 2013-02-04 17:00:34 +01:00
parent dfcf71f040
commit cf62ba330d
1 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java
View file

@ -34,6 +34,15 @@
package mage.client.game;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.io.Serializable;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import javax.swing.*;
import mage.client.MageFrame;
import mage.client.chat.ChatPanel;
import mage.client.components.MageTextArea;
@ -43,15 +52,6 @@ import mage.client.util.gui.ArrowBuilder;
import mage.remote.Session;
import org.apache.log4j.Logger;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.io.Serializable;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
/**
*
@ -154,13 +154,20 @@ public class FeedbackPanel extends javax.swing.JPanel {
}
/**
* Close game window by pressing OK button after 5 seconds
* Close game window by pressing OK button after 8 seconds
*/
private void endWithTimeout() {
Runnable task = new Runnable() {
@Override
public void run() {
logger.info("Ending game...");
FeedbackPanel.this.btnRight.doClick();
Component c = MageFrame.getGame(gameId);
while (c != null && !(c instanceof GamePane)) {
c = c.getParent();
}
if (c != null && ((GamePane)c).isVisible()) { // check if GamePanel still visible
FeedbackPanel.this.btnRight.doClick();
}
}
};
worker.schedule(task, 8, TimeUnit.SECONDS);
@ -342,6 +349,7 @@ public class FeedbackPanel extends javax.swing.JPanel {
btnRight.setText("Cancel");
btnRight.addActionListener(new java.awt.event.ActionListener() {
@Override
public void actionPerformed(java.awt.event.ActionEvent evt) {
btnRightActionPerformed(evt);
}
@ -349,6 +357,7 @@ public class FeedbackPanel extends javax.swing.JPanel {
btnLeft.setText("OK");
btnLeft.addActionListener(new java.awt.event.ActionListener() {
@Override
public void actionPerformed(java.awt.event.ActionEvent evt) {
btnLeftActionPerformed(evt);
}
@ -363,6 +372,7 @@ public class FeedbackPanel extends javax.swing.JPanel {
btnSpecial.setText("Special");
btnSpecial.addActionListener(new java.awt.event.ActionListener() {
@Override
public void actionPerformed(java.awt.event.ActionEvent evt) {
btnSpecialActionPerformed(evt);
}