From e878f4314871dc4ec1b3277ecf22ee2669b4fbee Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Thu, 4 Nov 2021 00:10:12 +0100 Subject: [PATCH] Fix #15602: Cannot relocate shops properly --- src/openrct2-ui/windows/RideConstruction.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 87a07a6d5d..9cf486e4a3 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -1936,7 +1936,8 @@ static void window_ride_construction_mouseup_demolish(rct_window* w) // When flat rides are deleted, the window should be reset so the ride can be placed again. const auto rideId = w->rideId; auto ride = get_ride(rideId); - if (ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_FLAT_RIDE)) + const auto& rtd = ride->GetRideTypeDescriptor(); + if (rtd.HasFlag(RIDE_TYPE_FLAG_FLAT_RIDE) && !rtd.HasFlag(RIDE_TYPE_FLAG_IS_SHOP)) { ride_initialise_construction_window(ride); }