From 258970a4064e8fe03fea68d18872e63d33b64d51 Mon Sep 17 00:00:00 2001
From: Lwmte <3331699+Lwmte@users.noreply.github.com>
Date: Fri, 2 Jun 2023 22:33:47 +0200
Subject: [PATCH] Fix possible nullref exception

---
 TombEngine/Objects/Generic/puzzles_keys.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/TombEngine/Objects/Generic/puzzles_keys.cpp b/TombEngine/Objects/Generic/puzzles_keys.cpp
index f1051c13e..6dddda428 100644
--- a/TombEngine/Objects/Generic/puzzles_keys.cpp
+++ b/TombEngine/Objects/Generic/puzzles_keys.cpp
@@ -331,9 +331,9 @@ void PuzzleDoneCollision(short itemNumber, ItemInfo* laraItem, CollisionInfo* co
 void PuzzleDone(ItemInfo* item, short itemNumber)
 {
 	auto triggerIndex = GetTriggerIndex(item);
-	short triggerType = (*(triggerIndex++) >> 8) & TRIGGER_BITS;
+	short triggerType = (triggerIndex != nullptr) ? (*(triggerIndex++) >> 8) & TRIGGER_BITS : TRIGGER_TYPES::TRIGGER;
 
-	if (triggerIndex != nullptr && triggerType == TRIGGER_TYPES::SWITCH)
+	if (triggerType == TRIGGER_TYPES::SWITCH)
 	{
 		item->ItemFlags[1] = true;