Merge branch 'master' into local

purerosefallen · Mar 30, 2018 · 13c51b1 · 13c51b1
2 parents 4b11195 + 6456f2c
commit 13c51b1
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/gframe/event_handler.cpp b/gframe/event_handler.cpp
@@ -2253,7 +2253,6 @@ void ClientField::CancelOrFinish() {
 		mainGame->HideElement(mainGame->wQuery, true);
 		break;
 	}
-	case MSG_SELECT_UNSELECT_CARD:
 	case MSG_SELECT_CARD: {
 		if(selected_cards.size() == 0) {
 			if(select_cancelable) {
@@ -2281,6 +2280,17 @@ void ClientField::CancelOrFinish() {
 		}
 		break;
 	}
+	case MSG_SELECT_UNSELECT_CARD: {
+        if (select_cancelable) {
+            DuelClient::SetResponseI(-1);
+            ShowCancelOrFinishButton(0);
+            if (mainGame->wCardSelect->isVisible())
+                mainGame->HideElement(mainGame->wCardSelect, true);
+            else
+                DuelClient::SendResponse();
+        }
+        break;
+    }
 	case MSG_SELECT_TRIBUTE: {
 		if(selected_cards.size() == 0) {
 			if(select_cancelable) {