From 349d19e834ce108a9fe2111ea5011748d601e12a Mon Sep 17 00:00:00 2001 From: TELK Date: Mon, 4 Dec 2017 02:05:51 +0900 Subject: [PATCH] Check rct_window is NULL --- src/openrct2/ride/ride.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/openrct2/ride/ride.c b/src/openrct2/ride/ride.c index 711187f546..b64668b39f 100644 --- a/src/openrct2/ride/ride.c +++ b/src/openrct2/ride/ride.c @@ -7685,9 +7685,6 @@ void ride_set_to_default_inspection_interval(sint32 rideIndex) */ void ride_crash(uint8 rideIndex, uint8 vehicleIndex) { - // It is unnecessary to deal with ride crash in headless server - if (gOpenRCT2Headless) return; - Ride *ride = get_ride(rideIndex); rct_vehicle *vehicle = GET_VEHICLE(ride->vehicles[vehicleIndex]); @@ -7698,7 +7695,7 @@ void ride_crash(uint8 rideIndex, uint8 vehicleIndex) rct_window * w = context_open_intent(intent); intent_release(intent); - if (w->viewport != NULL) { + if (w != NULL && w->viewport != NULL) { w->viewport->flags |= VIEWPORT_FLAG_SOUND_ON; } }