From 777fea6c8c87fed271fc42e882a828da7edad723 Mon Sep 17 00:00:00 2001 From: Matthias Moninger <5415177+ZehMatt@users.noreply.github.com> Date: Fri, 24 Feb 2023 13:45:24 +0200 Subject: [PATCH] Avoid triggering an assert when saving the park --- src/openrct2/park/ParkFile.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/openrct2/park/ParkFile.cpp b/src/openrct2/park/ParkFile.cpp index 46b5d93428c1..8d09ae213cab 100644 --- a/src/openrct2/park/ParkFile.cpp +++ b/src/openrct2/park/ParkFile.cpp @@ -1193,7 +1193,12 @@ namespace OpenRCT2 // Ride ID cs.ReadWrite(rideId); - auto& ride = *RideAllocateAtIndex(rideId); + auto& ride = [&]() -> Ride& { + if (cs.GetMode() == OrcaStream::Mode::WRITING) + return *GetRide(rideId); + else + return *RideAllocateAtIndex(rideId); + }(); // Status cs.ReadWrite(ride.type);