From e4dabad90caa017cee67b1cfdd7f9cf9b953cb0e Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Sun, 15 Mar 2026 09:16:58 -0700
Subject: [PATCH] Guard against null GameState in ReinitForCharacter

GameState() can return null during shutdown when camera re-init is
triggered. Add a null check before accessing m_currentArea.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 extensions/src/thirdpersoncamera/controller.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/src/thirdpersoncamera/controller.cpp b/extensions/src/thirdpersoncamera/controller.cpp
index a6ef51b7..878e5def 100644
--- a/extensions/src/thirdpersoncamera/controller.cpp
+++ b/extensions/src/thirdpersoncamera/controller.cpp
@@ -376,7 +376,7 @@ void Controller::HandleSDLEventImpl(SDL_Event* p_event)
 
 void Controller::ReinitForCharacter()
 {
-	if (IsRestrictedArea(GameState()->m_currentArea)) {
+	if (!GameState() || IsRestrictedArea(GameState()->m_currentArea)) {
 		m_active = false;
 		return;
 	}