From 68f861db0e4660cf45f9fadb7d541d74a60def6f Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Tue, 28 May 2013 05:02:21 +0000
Subject: [PATCH] remove input call won't update the input queue. it will get
 updated anyway - by unlock for instance

---
 src/main/java/forge/control/input/InputQueue.java  |  3 ---
 .../forge/control/input/InputSyncronizedBase.java  | 14 ++++----------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/main/java/forge/control/input/InputQueue.java b/src/main/java/forge/control/input/InputQueue.java
index 3f1fd258e17..15bd9ba77c6 100644
--- a/src/main/java/forge/control/input/InputQueue.java
+++ b/src/main/java/forge/control/input/InputQueue.java
@@ -85,13 +85,10 @@ public class InputQueue extends MyObservable implements java.io.Serializable {
      *            a boolean.
      */
     final void removeInput(Input inp) {
-        FThreads.assertExecutedByEdt(false);
         Input topMostInput = inputStack.isEmpty() ? null : inputStack.pop();
 
         if( topMostInput != inp )
             throw new RuntimeException("Cannot remove input " + inp.getClass().getSimpleName() + " because it's not on top of stack. Stack = " + inputStack );
-
-        this.updateObservers();
     }
 
     public final boolean isEmpty() {
diff --git a/src/main/java/forge/control/input/InputSyncronizedBase.java b/src/main/java/forge/control/input/InputSyncronizedBase.java
index edb721f48df..1041f3d7a04 100644
--- a/src/main/java/forge/control/input/InputSyncronizedBase.java
+++ b/src/main/java/forge/control/input/InputSyncronizedBase.java
@@ -30,16 +30,10 @@ public abstract class InputSyncronizedBase extends InputBase implements InputSyn
     protected final void stop() {
         // ensure input won't accept any user actions.
         FThreads.invokeInEdtNowOrLater(new Runnable() { @Override public void run() { setFinished(); } });
-            
-        // this will update input proxy, so there might be anything happening in the thread
-        getQueue().invokeGameAction( new Runnable() {
-            @Override
-            public void run() {
-                // this will update input proxy, so there might be anything happening in the thread 
-                getQueue().removeInput(InputSyncronizedBase.this);
-                cdlDone.countDown();
-            }
-        });
+
+        // thread irrelevant 
+        getQueue().removeInput(InputSyncronizedBase.this);
+        cdlDone.countDown();
     }
 
     @Override