From 383412252cc70bf8042d76aa3acdeb955ea94371 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Sat, 29 Jan 2022 16:42:27 +0200
Subject: [PATCH] Only modify gLastEntranceStyle for the callee of the game
 action

---
 src/openrct2-ui/windows/Ride.cpp                 | 5 +++++
 src/openrct2/actions/RideSetAppearanceAction.cpp | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp
index 2f9aab258d..010d69d513 100644
--- a/src/openrct2-ui/windows/Ride.cpp
+++ b/src/openrct2-ui/windows/Ride.cpp
@@ -4496,6 +4496,11 @@ static void WindowRideColourDropdown(rct_window* w, rct_widgetindex widgetIndex,
                     {
                         auto rideSetAppearanceAction = RideSetAppearanceAction(
                             rideId, RideSetAppearanceType::EntranceStyle, ddIndex, 0);
+                        rideSetAppearanceAction.SetCallback([ddIndex](const GameAction*, const GameActions::Result* res) {
+                            if (res->Error != GameActions::Status::Ok)
+                                return;
+                            gLastEntranceStyle = ddIndex;
+                        });
                         GameActions::Execute(&rideSetAppearanceAction);
                         break;
                     }
diff --git a/src/openrct2/actions/RideSetAppearanceAction.cpp b/src/openrct2/actions/RideSetAppearanceAction.cpp
index 3a4d42a16b..06cb0da04a 100644
--- a/src/openrct2/actions/RideSetAppearanceAction.cpp
+++ b/src/openrct2/actions/RideSetAppearanceAction.cpp
@@ -135,7 +135,6 @@ GameActions::Result RideSetAppearanceAction::Execute() const
             break;
         case RideSetAppearanceType::EntranceStyle:
             ride->entrance_style = _value;
-            gLastEntranceStyle = _value;
             gfx_invalidate_screen();
             break;
     }