Exit menu when actiity isn't set as paused- also makes us launch into save game immediately upon load instead of staying in the menu afterwards

Author: Causeless

Source/Main.cpp

@@ -271,6 +271,7 @@ void RunMenuLoop() {
 		if (g_MenuMan.Update()) {
 			break;
 		}
+
 		g_ConsoleMan.Update();
 
 		g_UInputMan.EndFrame();
@@ -381,7 +382,6 @@ void RunGameLoop() {
 				g_PerformanceMan.ResetSimUpdateTimer();
 				updateStartTime = g_TimerMan.GetAbsoluteTime();
 			}
-
 		}
 
 		updateEndAndDrawStartTime = g_TimerMan.GetAbsoluteTime();

Source/Managers/MenuMan.cpp

@@ -129,6 +129,12 @@ void MenuMan::HandleTransitionIntoMenuLoop() {
 }
 
 bool MenuMan::Update() {
+	// If we're in the menu but the activity isn't set as paused, then exit
+	// This can mismatch sometimes like when loading a saved game
+	if (m_ActiveMenu != ActiveMenu::MenusDisabled && !g_ActivityMan.ActivityPaused()) {
+		return true;
+	}
+
 	m_TitleScreen->Update();
 	SetActiveMenu();