From 11e490a56d617127a941e7a1be58199e7dcb4606 Mon Sep 17 00:00:00 2001
From: Kyphii <finneyt16@gmail.com>
Date: Mon, 6 Oct 2025 18:52:55 -0400
Subject: [PATCH] Force close simulating rides when changing ride mode

---
 src/openrct2/actions/RideSetSettingAction.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/openrct2/actions/RideSetSettingAction.cpp b/src/openrct2/actions/RideSetSettingAction.cpp
index 52b04dbe29..7afabd1b03 100644
--- a/src/openrct2/actions/RideSetSettingAction.cpp
+++ b/src/openrct2/actions/RideSetSettingAction.cpp
@@ -8,7 +8,7 @@
  *****************************************************************************/
 
 #include "RideSetSettingAction.h"
-
+#include "RideSetStatusAction.h"
 #include "../Context.h"
 #include "../Diagnostic.h"
 #include "../GameState.h"
@@ -169,6 +169,13 @@ namespace OpenRCT2::GameActions
                 RideClearForConstruction(*ride);
                 ride->removePeeps();
 
+                if (ride->status == RideStatus::simulating)
+                {
+                    // Also close the ride
+                    auto gameAction = GameActions::RideSetStatusAction(ride->id, RideStatus::closed);
+                    ExecuteNested(&gameAction, gameState);
+                }
+
                 ride->mode = static_cast<RideMode>(_value);
                 ride->updateMaxVehicles();
                 ride->updateNumberOfCircuits();