From f2b4d9dcf6477d575fe52ad9f0a5372be0272bae Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Sat, 14 Jan 2023 23:21:03 +0100 Subject: [PATCH] Fix #14003: NPE in TryReconnectBoatToTrack() --- src/openrct2/ride/Vehicle.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index 88c023c23d..e195852f28 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -4230,12 +4230,13 @@ void Vehicle::TryReconnectBoatToTrack(const CoordsXY& currentBoatLocation, const TrackLocation.x = trackCoords.x; TrackLocation.y = trackCoords.y; - auto trackElement = MapGetTrackElementAt(TrackLocation); - auto curRide = GetRide(); if (curRide != nullptr) { - SetTrackType(trackElement->GetTrackType()); + auto trackElement = MapGetTrackElementAt(TrackLocation); + if (trackElement != nullptr) + SetTrackType(trackElement->GetTrackType()); + SetTrackDirection(curRide->boat_hire_return_direction); BoatLocation.SetNull(); }