From 935a91593cde3374fb984ae385e5d5484dd92a0b Mon Sep 17 00:00:00 2001
From: slapshot5 <slapshot5@cardforge.org>
Date: Fri, 6 Jan 2012 04:20:39 +0000
Subject: [PATCH] fix the Observers leak on MagicStack

---
 src/main/java/forge/GuiInput.java                    | 2 ++
 src/main/java/forge/control/match/ControlTabber.java | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/forge/GuiInput.java b/src/main/java/forge/GuiInput.java
index 9431ce82fdc..c748e67758e 100644
--- a/src/main/java/forge/GuiInput.java
+++ b/src/main/java/forge/GuiInput.java
@@ -44,7 +44,9 @@ public class GuiInput extends MyObservable implements Observer {
         AllZone.getInputControl().deleteObservers();
         AllZone.getInputControl().addObserver(this);
 
+        AllZone.getStack().deleteObservers();
         AllZone.getStack().addObserver(this);
+
         AllZone.getPhase().addObserver(this);
 
         //System.out.println("Stack observers: " + AllZone.getStack().countObservers());
diff --git a/src/main/java/forge/control/match/ControlTabber.java b/src/main/java/forge/control/match/ControlTabber.java
index 6cafb4f184f..95d447a37d6 100644
--- a/src/main/java/forge/control/match/ControlTabber.java
+++ b/src/main/java/forge/control/match/ControlTabber.java
@@ -113,9 +113,9 @@ public class ControlTabber extends MyObservable {
     public void addObservers() {
 
         AllZone.getStack().deleteObserver(stackObserver);
-        AllZone.getGameLog().deleteObserver(logObserver);
-
         AllZone.getStack().addObserver(stackObserver);
+
+        AllZone.getGameLog().deleteObserver(logObserver);
         AllZone.getGameLog().addObserver(logObserver);
     }