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

- Call setFocusable and setEnabled in CMatchUI in the event dispatch thread to try and prevent a crash in this area resulting from threading issues.

Browse Source
This commit is contained in:
Agetian
2017-02-08 16:06:46 +00:00
parent 2580e67cb4
commit 6fbc395f79
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
View File

@@ -572,16 +572,17 @@ public final class CMatchUI
//btn1.setFocusable(false); //btn1.setFocusable(false);
//else if (toFocus == btn1) //else if (toFocus == btn1)
//btn2.setFocusable(false); //btn2.setFocusable(false);
btn2.setFocusable(enable2); // order may matter here
btn1.setFocusable(enable1);
btn2.setEnabled(enable2);
btn1.setEnabled(enable1);
// ensure we don't steal focus from an overlay // ensure we don't steal focus from an overlay
if (toFocus != null) { if (toFocus != null) {
final Runnable focusRoutine = new Runnable() { final Runnable focusRoutine = new Runnable() {
@Override @Override
public final void run() { public final void run() {
btn2.setFocusable(enable2); // order may matter here
btn1.setFocusable(enable1);
btn2.setEnabled(enable2);
btn1.setEnabled(enable1);
toFocus.requestFocus(); // focus here even if another window has focus - shouldn't have to do it this way but some popups grab window focus toFocus.requestFocus(); // focus here even if another window has focus - shouldn't have to do it this way but some popups grab window focus
} }
}; };