Merge branch 'master' into server

82c6b505 · nanahira · 4d68228d · 4792eadd · 82c6b505 · 82c6b505
Commit 82c6b505 authored Sep 16, 2019 by nanahira
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 193 additions and 23 deletions

gframe/event_handler.cpp gframe/event_handler.cpp +1 -0

lflist.conf lflist.conf +192 -23

No files found.
--- a/gframe/event_handler.cpp
+++ b/gframe/event_handler.cpp
@@ -2480,6 +2480,7 @@ void ClientField::CancelOrFinish() {
 		if(selected_cards.size() == 0) {
 			if(select_cancelable) {
 				DuelClient::SetResponseI(-1);
+				ShowCancelOrFinishButton(0);
 				if(mainGame->wCardSelect->isVisible())
 					mainGame->HideElement(mainGame->wCardSelect, true);
 				else

--- a/lflist.conf
+++ b/lflist.conf