From f7b5a1f4566235bc2cd76fa34a997850d4ee1e89 Mon Sep 17 00:00:00 2001
From: "seer-by-sentry[bot]"
 <157164994+seer-by-sentry[bot]@users.noreply.github.com>
Date: Thu, 23 Apr 2026 09:21:23 +0000
Subject: [PATCH] bugfix(SupplyTruckAI): Halt state machine on destruction

---
 .../GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp    | 2 ++
 .../GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp
index 7b7ed3a3cb0..f5d0fe97c8e 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp
@@ -83,6 +83,8 @@ SupplyTruckAIUpdate::SupplyTruckAIUpdate( Thing *thing, const ModuleData* module
 //-------------------------------------------------------------------------------------------------
 SupplyTruckAIUpdate::~SupplyTruckAIUpdate()
 {
+	if (m_supplyTruckStateMachine)
+		m_supplyTruckStateMachine->halt();
 	deleteInstance(m_supplyTruckStateMachine);
 }
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp
index 17def78624e..c64796eddaa 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp
@@ -89,6 +89,8 @@ SupplyTruckAIUpdate::SupplyTruckAIUpdate( Thing *thing, const ModuleData* module
 //-------------------------------------------------------------------------------------------------
 SupplyTruckAIUpdate::~SupplyTruckAIUpdate()
 {
+	if (m_supplyTruckStateMachine)
+		m_supplyTruckStateMachine->halt();
 	deleteInstance(m_supplyTruckStateMachine);
 }