From fa833f79c29f89ab1be504d8aa63e2b73b8e3ac8 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Sat, 25 May 2013 20:18:53 +0000 Subject: [PATCH] Pass priority will not lock input - bottomless vault no longer deadlocks --- src/main/java/forge/control/input/InputNonSyncBase.java | 3 ++- src/main/java/forge/gui/InputProxy.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/forge/control/input/InputNonSyncBase.java b/src/main/java/forge/control/input/InputNonSyncBase.java index edbc62cdaaa..98bcf6bd7cb 100644 --- a/src/main/java/forge/control/input/InputNonSyncBase.java +++ b/src/main/java/forge/control/input/InputNonSyncBase.java @@ -18,7 +18,8 @@ public abstract class InputNonSyncBase extends InputBase { } }; if( FThreads.isEDT() ) - player.getGame().getInputQueue().LockAndInvokeGameAction(pass); + FThreads.invokeInNewThread(pass); +// player.getGame().getInputQueue().LockAndInvokeGameAction(pass); else pass.run(); } diff --git a/src/main/java/forge/gui/InputProxy.java b/src/main/java/forge/gui/InputProxy.java index 21e289cbc83..48c5ed4e1d6 100644 --- a/src/main/java/forge/gui/InputProxy.java +++ b/src/main/java/forge/gui/InputProxy.java @@ -53,6 +53,8 @@ public class InputProxy implements Observer { @Override public final synchronized void update(final Observable observable, final Object obj) { + //synchronized(this) {} // want to update all changes to memory + final PhaseHandler ph = game.getPhaseHandler(); if(INPUT_DEBUG)