From 5f8f6ad3e3435669593cd6abda68a65cea9c50f0 Mon Sep 17 00:00:00 2001 From: "seer-by-sentry[bot]" <157164994+seer-by-sentry[bot]@users.noreply.github.com> Date: Wed, 11 Mar 2026 11:21:20 +0000 Subject: [PATCH] Fix: Correctly restore ScriptEngine's condition team --- .../GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp | 4 ++-- .../GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp index 3a2f2860b02..16546075a5d 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp @@ -5334,7 +5334,7 @@ void ScriptEngine::runScript(const AsciiString& scriptName, Team *pThisTeam) Player *savPlayer = m_currentPlayer; -// Team *pSavConditionTeam = m_conditionTeam; + Team *pSavConditionTeam = m_conditionTeam; LatchRestore latch(m_callingTeam, pThisTeam); m_conditionTeam = nullptr; @@ -5371,7 +5371,7 @@ void ScriptEngine::runScript(const AsciiString& scriptName, Team *pThisTeam) } } // m_callingTeam is restored automatically via LatchRestore - m_conditionTeam = m_conditionTeam; + m_conditionTeam = pSavConditionTeam; m_currentPlayer = savPlayer; } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp index e981c695520..68aa13d700c 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp @@ -6071,7 +6071,7 @@ void ScriptEngine::runScript(const AsciiString& scriptName, Team* pThisTeam) Player* savPlayer = m_currentPlayer; - // Team *pSavConditionTeam = m_conditionTeam; + Team* pSavConditionTeam = m_conditionTeam; LatchRestore latch(m_callingTeam, pThisTeam); m_conditionTeam = NULL; @@ -6112,7 +6112,7 @@ void ScriptEngine::runScript(const AsciiString& scriptName, Team* pThisTeam) } } // m_callingTeam is restored automatically via LatchRestore - m_conditionTeam = m_conditionTeam; + m_conditionTeam = pSavConditionTeam; m_currentPlayer = savPlayer; }