finish

gframe/duelclient.cpp

@@ -662,7 +662,7 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
 		mainGame->btnChainAlways->setVisible(false);
 		mainGame->btnChainWhenAvail->setVisible(false);
 		mainGame->btnCancelOrFinish->setVisible(false);
-		if(!mainGame->dInfo.isReplay)
+		if(!mainGame->dInfo.isReplay && mainGame->dInfo.isReplaySkiping)
 			mainGame->dInfo.isReplaySkiping = false;
 		mainGame->stMessage->setText(dataManager.GetSysString(1500));
 		mainGame->PopupElement(mainGame->wMessage);
@@ -1063,6 +1063,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 		mainGame->dInfo.isFinished = true;
 		if(!mainGame->dInfo.isReplay && mainGame->dInfo.isReplaySkiping) {
 			mainGame->dInfo.isReplaySkiping = false;
+			mainGame->gMutex.Lock();
 			mainGame->dField.RefreshAllCards();
 			mainGame->gMutex.Unlock();
 		}

gframe/event_handler.cpp

@@ -1683,9 +1683,8 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 		case irr::KEY_KEY_Z: {
 			if(mainGame->dInfo.isStarted && !mainGame->dInfo.isReplay && !mainGame->HasFocus(EGUIET_EDIT_BOX)) {
 				mainGame->dInfo.isReplaySkiping = event.KeyInput.PressedDown;
-				if(mainGame->dInfo.isReplaySkiping)
+				if(!mainGame->dInfo.isReplaySkiping) {
 					mainGame->gMutex.Lock();
-				else {
 					mainGame->dField.RefreshAllCards();
 					mainGame->gMutex.Unlock();
 				}