From 0430cfb6dbc20c72e51a97fbcf8875805e0d8530 Mon Sep 17 00:00:00 2001
From: Michael Steenbeek <m.o.steenbeek@gmail.com>
Date: Sat, 6 Jan 2018 14:42:46 +0100
Subject: [PATCH] Fix #6963: Demolishing ride 0 causes freezes

---
 src/openrct2/actions/RideDemolishAction.hpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/openrct2/actions/RideDemolishAction.hpp b/src/openrct2/actions/RideDemolishAction.hpp
index c226b6acfa..cf0a37510b 100644
--- a/src/openrct2/actions/RideDemolishAction.hpp
+++ b/src/openrct2/actions/RideDemolishAction.hpp
@@ -171,7 +171,8 @@ public:
 
             for (sint32 i = 0; i < PEEP_MAX_THOUGHTS; i++)
             {
-                if (peep->thoughts[i].item == _rideIndex)
+                if (peep->thoughts[i].type != PEEP_THOUGHT_TYPE_NONE &&
+                    peep->thoughts[i].item == _rideIndex)
                 {
                     // Clear top thought, push others up
                     memmove(&peep->thoughts[i], &peep->thoughts[i + 1], sizeof(rct_peep_thought)*(PEEP_MAX_THOUGHTS - i - 1));