From 2427b714a121c5f26d5dd9d81b04e0e6f67c18d8 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Thu, 6 Feb 2014 15:22:21 +0100
Subject: [PATCH] MageFrame changed logic the handle the activeFrame.

---
 Mage.Client/src/main/java/mage/client/MageFrame.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java
index 3d225b48fe9..261dd9d9475 100644
--- a/Mage.Client/src/main/java/mage/client/MageFrame.java
+++ b/Mage.Client/src/main/java/mage/client/MageFrame.java
@@ -526,6 +526,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 
     public static void setActive(MagePane frame) {
         if (frame == null) {
+            activeFrame = null;
             return;
         }
         logger.debug("Setting " + frame.getTitle() + " active");
@@ -552,11 +553,11 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 
     public static void deactivate(MagePane frame) {
         frame.setVisible(false);
-        MagePane topmost = getTopMost(frame);
+        setActive(getTopMost(frame));
         if (activeFrame != frame) {
             frame.deactivated();
         }
-        setActive(topmost);
+        
     }
 
     private static MagePane getTopMost(MagePane exclude) {
@@ -568,7 +569,9 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
                 if (z < best) {
                     if (frame instanceof MagePane) {
                         best = z;
-                        topmost = (MagePane) frame;
+                        if (!frame.equals(exclude)) {
+                            topmost = (MagePane) frame;
+                        }
                     }
                 }
             }