From 2979d5b8ff71a27b1d43073f7f1e186ff6ed4f8c Mon Sep 17 00:00:00 2001
From: "seer-by-sentry[bot]"
 <157164994+seer-by-sentry[bot]@users.noreply.github.com>
Date: Wed, 18 Feb 2026 20:11:30 +0000
Subject: [PATCH] Fix: Early exit when skirmish map not found

---
 .../GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp           | 1 +
 .../GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp           | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp
index 3cda3f62dee..de610618ee2 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp
@@ -505,6 +505,7 @@ static void startPressed(void)
 	{
 		buttonPushed = FALSE;
 		MessageBoxOk(TheGameText->fetch("GUI:ErrorStartingGame"), TheGameText->fetch("GUI:CantFindMap"), nullptr);
+		return;
 	}
 	MapMetaData mmd = it->second;
 	if(playerCount > mmd.m_numPlayers)
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp
index 81d5aef70ec..949887f163f 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp
@@ -517,6 +517,7 @@ static void startPressed(void)
 	{
 		buttonPushed = FALSE;
 		MessageBoxOk(TheGameText->fetch("GUI:ErrorStartingGame"), TheGameText->fetch("GUI:CantFindMap"), nullptr);
+		return;
 	}
 	MapMetaData mmd = it->second;
 	if(playerCount > mmd.m_numPlayers)