From c33b8ccdc58db4501e6760d312bc8cb814aeba5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= <janisozaur@gmail.com>
Date: Wed, 23 Mar 2016 16:10:55 +0100
Subject: [PATCH] Don't crash when fixing a hacked ride

---
 src/peep/peep.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/peep/peep.c b/src/peep/peep.c
index 191d612e31..13815d21f3 100644
--- a/src/peep/peep.c
+++ b/src/peep/peep.c
@@ -3757,6 +3757,9 @@ static bool peep_update_fixing_sub_state_9(bool firstRun, rct_peep *peep, rct_ri
 		input.x = (stationPosition & 0xFF) * 32;
 		input.y = (stationPosition >> 8) * 32;
 		input.element = map_get_track_element_at_from_ride(input.x, input.y, stationZ, peep->current_ride);
+		if (input.element == NULL) {
+			return true;
+		}
 
 		track_begin_end trackBeginEnd;
 		while (track_block_get_previous(input.x, input.y, input.element, &trackBeginEnd)) {