From 6d71c43db47e756c8089da5b28cd9632a16b43a5 Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Tue, 27 Jan 2026 18:33:11 -0700
Subject: [PATCH 1/2] Re-add CrashHandler initialization. (#132)

---
 src/port/Engine.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/port/Engine.cpp b/src/port/Engine.cpp
index 04505a376..5ad6d7353 100644
--- a/src/port/Engine.cpp
+++ b/src/port/Engine.cpp
@@ -210,6 +210,7 @@ GameEngine::GameEngine() : dictionary(nullptr) {
 
     context->InitGfxDebugger();
     context->InitFileDropMgr();
+    context->InitCrashHandler();
 
     this->context->InitAudio({ .SampleRate = 32000, .SampleLength = 512, .DesiredBuffered = 1100 });
 

From 60980fb1f1aef39c662065925d5354dab68e7fdc Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Thu, 29 Jan 2026 18:30:40 -0700
Subject: [PATCH 2/2] Fixes crash on exit. (#134)

---
 src/port/Engine.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/port/Engine.cpp b/src/port/Engine.cpp
index 5ad6d7353..62895a94e 100644
--- a/src/port/Engine.cpp
+++ b/src/port/Engine.cpp
@@ -412,6 +412,7 @@ void GameEngine::Create() {
 
 void GameEngine::Destroy() {
     GhostshipGui::Destroy();
+    gsFast3dWindow = nullptr;
     Instance->context = nullptr;
     AudioExit();
 #ifdef __SWITCH__