From 17c7ea63baf413a1c2d3c2d18dc672602ac7b0d8 Mon Sep 17 00:00:00 2001
From: Oleg Agafonov <jaydi85@gmail.com>
Date: Sat, 18 Jan 2020 13:02:41 +0400
Subject: [PATCH] Merge fix

---
 .../main/java/mage/client/components/ability/AbilityPicker.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mage.Client/src/main/java/mage/client/components/ability/AbilityPicker.java b/Mage.Client/src/main/java/mage/client/components/ability/AbilityPicker.java
index 59cec83440d..7dc263ddc42 100644
--- a/Mage.Client/src/main/java/mage/client/components/ability/AbilityPicker.java
+++ b/Mage.Client/src/main/java/mage/client/components/ability/AbilityPicker.java
@@ -489,7 +489,7 @@ public class AbilityPicker extends JXPanel implements MouseWheelListener {
         }
         for (Object obj : choices) {
             AbilityPickerAction action = (AbilityPickerAction) obj;
-            if (Modes.CHOOSE_OPTION_DONE_ID.equals(action.id)) {
+            if (Modes.CHOOSE_OPTION_CANCEL_ID.equals(action.id)) {
                 action.actionPerformed(null);
                 break;
             }