Fix: [Script] Only show debug script window at the end of savegame lo…

…ading (OpenTTD#12135)
glx22 · Feb 20, 2024 · 2d7ad9f · 2d7ad9f
1 parent f1bf39f
commit 2d7ad9f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/ai/ai_instance.cpp b/src/ai/ai_instance.cpp
@@ -64,6 +64,9 @@ void AIInstance::Died()
 	/* Intro is not supposed to use AI, but it may have 'dummy' AI which instant dies. */
 	if (_game_mode == GM_MENU) return;
 
+	/* Don't show errors while loading savegame. They will be shown at end of loading anyway. */
+	if (_switch_mode != SM_NONE) return;
+
 	ShowScriptDebugWindow(_current_company);
 
 	const AIInfo *info = AIConfig::GetConfig(_current_company)->GetInfo();

diff --git a/src/game/game_instance.cpp b/src/game/game_instance.cpp
@@ -67,6 +67,9 @@ void GameInstance::Died()
 {
 	ScriptInstance::Died();
 
+	/* Don't show errors while loading savegame. They will be shown at end of loading anyway. */
+	if (_switch_mode != SM_NONE) return;
+
 	ShowScriptDebugWindow(OWNER_DEITY);
 
 	const GameInfo *info = Game::GetInfo();