From 2240c04cec04ea3db618b826df70e82c5e92b28f Mon Sep 17 00:00:00 2001
From: PJB3005 <pieterjan.briers+git@gmail.com>
Date: Thu, 26 Mar 2026 15:03:48 +0100
Subject: [PATCH] Fix shutdown crash

---
 include/dusk/main.h                      | 8 ++++++++
 libs/JSystem/src/JAudio2/JAIAudience.cpp | 9 +++++++++
 src/m_Do/m_Do_main.cpp                   | 7 +++++++
 3 files changed, 24 insertions(+)
 create mode 100644 include/dusk/main.h

diff --git a/include/dusk/main.h b/include/dusk/main.h
new file mode 100644
index 0000000000..b357de8ea5
--- /dev/null
+++ b/include/dusk/main.h
@@ -0,0 +1,8 @@
+#ifndef DUSK_MAIN_H
+#define DUSK_MAIN_H
+
+namespace dusk {
+    extern bool IsShuttingDown;
+}
+
+#endif  // DUSK_MAIN_H
diff --git a/libs/JSystem/src/JAudio2/JAIAudience.cpp b/libs/JSystem/src/JAudio2/JAIAudience.cpp
index 3e1205e2fc..a14422a943 100644
--- a/libs/JSystem/src/JAudio2/JAIAudience.cpp
+++ b/libs/JSystem/src/JAudio2/JAIAudience.cpp
@@ -1,11 +1,20 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JAIAudience.h"
+
 #include "JSystem/JAudio2/JAISeMgr.h"
 #include "JSystem/JAudio2/JAISeqMgr.h"
 #include "JSystem/JAudio2/JAIStreamMgr.h"
+#include "dusk/main.h"
 
 JAIAudience::~JAIAudience() {
+#if TARGET_PC
+    if (dusk::IsShuttingDown) {
+        // Those asserts down there crash on shutdown from dtors.
+        return;
+    }
+#endif
+
     JUT_ASSERT(14, ! JAISeMgr::getInstance() || ( JAISeMgr::getInstance() ->getAudience() != this ));
     JUT_ASSERT(15, ! JAISeqMgr::getInstance() || ( JAISeqMgr::getInstance() ->getAudience() != this ));
     JUT_ASSERT(16, ! JAIStreamMgr::getInstance() || ( JAIStreamMgr::getInstance() ->getAudience() != this ));
diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp
index 20fc2a8aee..d03b352151 100644
--- a/src/m_Do/m_Do_main.cpp
+++ b/src/m_Do/m_Do_main.cpp
@@ -47,6 +47,7 @@
 #include "dusk/dusk.h"
 #include "dusk/logging.h"
 #include "dusk/time.h"
+#include "dusk/main.h"
 
 #include <aurora/aurora.h>
 #include <aurora/event.h>
@@ -73,6 +74,10 @@ const int audioHeapSize = 0x14D800;
 // =========================================================================
 #define COPYDATE_PATH "/str/Final/Release/COPYDATE"
 
+#if TARGET_PC
+bool dusk::IsShuttingDown = false;
+#endif
+
 s32 LOAD_COPYDATE(void*) {
     char buffer[32];
     memset(buffer, 0, sizeof(buffer));
@@ -306,6 +311,8 @@ int game_main(int argc, char* argv[]) {
     fflush(stdout);
     fflush(stderr);
 
+    dusk::IsShuttingDown = true;
+
     aurora_shutdown();
 
     return 0;