From b99edf9a6b5271c7784d51abad4db716fc15addc Mon Sep 17 00:00:00 2001
From: Nikolay Korolev <nickvnuk@gmail.com>
Date: Thu, 12 Aug 2021 11:23:10 +0300
Subject: mission retry fix

---
 src/core/Frontend.cpp | 20 +++++++++++++++++---
 src/core/Frontend.h   |  4 ++++
 2 files changed, 21 insertions(+), 3 deletions(-)

(limited to 'src/core')

diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 22be4848..6ef75a33 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -542,6 +542,10 @@ CMenuManager::CMenuManager()
 #ifdef GAMEPAD_MENU
 	m_PrefsControllerType = CONTROLLER_XBOXONE;
 #endif
+
+#ifdef MISSION_REPLAY
+	m_bAttemptingMissionRetry = false;
+#endif
 }
 
 void
@@ -573,11 +577,17 @@ CMenuManager::Initialise(void)
 	m_fMapCenterY = MENU_Y(225.0f);
 	CPad::StopPadsShaking();
 #ifdef MISSION_REPLAY
-	if (!m_OnlySaveMenu && m_nCurrScreen != MENUPAGE_MISSION_RETRY)
+	if (!m_OnlySaveMenu) {
+		if (m_nCurrScreen == MENUPAGE_MISSION_RETRY && m_bAttemptingMissionRetry)
+			m_bAttemptingMissionRetry = false;
+		else
+			m_nCurrScreen = MENUPAGE_NONE;
+	}
 #else
 	if (!m_OnlySaveMenu)
-#endif
 		m_nCurrScreen = MENUPAGE_NONE;
+#endif
+
 	DMAudio.ChangeMusicMode(MUSICMODE_FRONTEND);
 	DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_STARTING, 0);
 	DMAudio.Service();
@@ -4447,7 +4457,11 @@ CMenuManager::UserInput(void)
 		if (CPad::GetPad(0)->GetBackJustDown() || CPad::GetPad(0)->GetEscapeJustDown()) {
 			if (m_nCurrScreen != MENUPAGE_START_MENU && m_nCurrScreen != MENUPAGE_PAUSE_MENU && m_nCurrScreen != MENUPAGE_CHOOSE_SAVE_SLOT
 				&& m_nCurrScreen != MENUPAGE_SAVE_CHEAT_WARNING && m_nCurrScreen != MENUPAGE_SAVING_IN_PROGRESS
-				&& m_nCurrScreen != MENUPAGE_DELETING_IN_PROGRESS && m_nCurrScreen != MENUPAGE_OUTRO)
+				&& m_nCurrScreen != MENUPAGE_DELETING_IN_PROGRESS && m_nCurrScreen != MENUPAGE_OUTRO
+#ifdef MISSION_REPLAY
+				&& m_nCurrScreen != MENUPAGE_MISSION_RETRY
+#endif
+				)
 			{
 				m_bShowMouse = false;
 				goBack = true;
diff --git a/src/core/Frontend.h b/src/core/Frontend.h
index 858d3fd9..31d6fa8d 100644
--- a/src/core/Frontend.h
+++ b/src/core/Frontend.h
@@ -711,6 +711,10 @@ public:
 	int8 m_nDisplayMSAALevel;
 #endif
 
+#ifdef MISSION_REPLAY
+	bool m_bAttemptingMissionRetry;
+#endif
+
 #ifdef GAMEPAD_MENU
 	enum
 	{
-- 
cgit v1.2.3