From 51a20a21d2662579b4df995d868d980ab1a07904 Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Mon, 24 Mar 2014 01:38:36 +0000
Subject: [PATCH] Fix issue with card zoom following double-click activation

---
 forge-m-base/src/forge/toolbox/FCardZoom.java | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/forge-m-base/src/forge/toolbox/FCardZoom.java b/forge-m-base/src/forge/toolbox/FCardZoom.java
index ba210d178e8..9dd419ef745 100644
--- a/forge-m-base/src/forge/toolbox/FCardZoom.java
+++ b/forge-m-base/src/forge/toolbox/FCardZoom.java
@@ -138,17 +138,15 @@ public class FCardZoom extends FOverlay {
 
     @Override
     public void hide() {
-        if (isVisible()) {
-            orderedCards = null; //reset fields when hidden
-            controller = null;
-            selectedIndex = -1;
-            optionList.clear();
-            optionListExpanded = false;
-            prompt.setMessage(null);
-            prompt.getBtnCancel().setText("More");
-            prompt.getBtnCancel().setEnabled(false);
-            super.hide();
-        }
+        orderedCards = null; //reset fields when hidden
+        controller = null;
+        selectedIndex = -1;
+        optionList.clear();
+        optionListExpanded = false;
+        prompt.setMessage(null);
+        prompt.getBtnCancel().setText("More");
+        prompt.getBtnCancel().setEnabled(false);
+        super.hide();
     }
 
     private void selectFirstOption() {
@@ -159,6 +157,7 @@ public class FCardZoom extends FOverlay {
     private void selectOption(Object option) {
         if (option == null ||
                 controller.selectOption(orderedCards.get(selectedIndex), option) ||
+                !isVisible() ||
                 selectedIndex == orderedCards.size() - 1) {
             hide();
         }