From 875115ec33478c986fd59bbf48eb1d2c592d5a07 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Sat, 1 Jan 2022 15:07:42 +0100 Subject: [PATCH] Fix #16343: Crash in Ride::PopulateVehicleTypeDropdown() --- src/openrct2-ui/windows/Ride.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 7efce31f26..5cea1df285 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -2115,7 +2115,9 @@ static void PopulateVehicleTypeDropdown(Ride* ride, bool forceRefresh) auto& rideEntries = objManager.GetAllRideEntries(rideTypeIterator); for (auto rideEntryIndex : rideEntries) { - auto currentRideEntry = get_ride_entry(rideEntryIndex); + const auto* currentRideEntry = get_ride_entry(rideEntryIndex); + if (currentRideEntry == nullptr) + continue; // Skip if vehicle type has not been invented yet if (!ride_entry_is_invented(rideEntryIndex) && !gCheatsIgnoreResearchStatus)