From f7d8fd81ff0429cf057e8c633e7bc23af409fe85 Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Tue, 7 May 2013 16:05:01 +0000
Subject: [PATCH] another fix (non-mandatory choice from hand)

---
 src/main/java/forge/card/ability/effects/ChangeZoneEffect.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java b/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java
index 06864109f7d..a903826a48a 100644
--- a/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java
+++ b/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java
@@ -749,7 +749,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
                     inp.setCancelAllowed(!mustChoose);
                     inp.setMessage(selectPrompt);
                     FThreads.setInputAndWait(inp);
-                    c = inp.getSelected().get(0);
+                    c = inp.hasCancelled() ? null : inp.getSelected().get(0);
                 }
                 else {
                     List<Card> chosen = GuiChoose.getChoices(selectPrompt, 0, mustChoose ? 1 : 0, fetchList);