From 4f09fc65acc6ff72925790100bd24a4ab48b607e Mon Sep 17 00:00:00 2001
From: PJB3005 <pieterjan.briers+git@gmail.com>
Date: Thu, 12 Mar 2026 11:47:04 +0100
Subject: [PATCH] Remove JASAudioThread race condition fixing code

I'm not planning on using JASAudioThread anymore
---
 .../include/JSystem/JAudio2/JASAudioThread.h   |  5 -----
 libs/JSystem/src/JAudio2/JASAudioThread.cpp    | 18 +-----------------
 src/Z2AudioLib/Z2AudioMgr.cpp                  | 13 -------------
 3 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/libs/JSystem/include/JSystem/JAudio2/JASAudioThread.h b/libs/JSystem/include/JSystem/JAudio2/JASAudioThread.h
index 6be7d07000..dd9fed2183 100644
--- a/libs/JSystem/include/JSystem/JAudio2/JASAudioThread.h
+++ b/libs/JSystem/include/JSystem/JAudio2/JASAudioThread.h
@@ -32,11 +32,6 @@ struct JASAudioThread : public JKRThread, public JASGlobalInstance<JASAudioThrea
 	
     static volatile int snIntCount; // type unsure
 
-#if TARGET_PC
-    static bool sThreadInitComplete;
-    static OSMutex sThreadInitCompleteMutex;
-    static OSCond sThreadInitCompleteCond;
-#endif
 };
 
 #endif /* JASAUDIOTHREAD_H */
diff --git a/libs/JSystem/src/JAudio2/JASAudioThread.cpp b/libs/JSystem/src/JAudio2/JASAudioThread.cpp
index ab059cf747..c978e62aeb 100644
--- a/libs/JSystem/src/JAudio2/JASAudioThread.cpp
+++ b/libs/JSystem/src/JAudio2/JASAudioThread.cpp
@@ -21,17 +21,8 @@ JASAudioThread::JASAudioThread(int stackSize, int msgCount, u32 threadPriority)
     OSInitThreadQueue(&sThreadQueue);
 }
 
-#if TARGET_PC
-bool JASAudioThread::sThreadInitComplete = false;
-OSMutex JASAudioThread::sThreadInitCompleteMutex;
-OSCond JASAudioThread::sThreadInitCompleteCond;
-#endif
-
 void JASAudioThread::create(s32 threadPriority) {
-#if TARGET_PC
-    OSInitMutex(&sThreadInitCompleteMutex);
-    OSInitCond(&sThreadInitCompleteCond);
-#endif
+    OSPanic(__FILE__, __LINE__, "JASAudioThread does not work on PC!");
 
 #if PLATFORM_GCN
     const int size = 0x1400;
@@ -79,13 +70,6 @@ void* JASAudioThread::run() {
     JASPoolAllocObject_MultiThreaded<JASChannel>::newMemPool(0x48);
     JASDriver::startDMA();
 
-#if TARGET_PC
-    OSLockMutex(&sThreadInitCompleteMutex);
-    sThreadInitComplete = true;
-    OSUnlockMutex(&sThreadInitCompleteMutex);
-    OSSignalCond(&sThreadInitCompleteCond);
-#endif
-
     OSMessage msg;
     while (true) {
         msg = waitMessageBlock();
diff --git a/src/Z2AudioLib/Z2AudioMgr.cpp b/src/Z2AudioLib/Z2AudioMgr.cpp
index 218881fbc9..1cfc4b28b1 100644
--- a/src/Z2AudioLib/Z2AudioMgr.cpp
+++ b/src/Z2AudioLib/Z2AudioMgr.cpp
@@ -106,19 +106,6 @@ void Z2AudioMgr::init(JKRSolidHeap* heap, u32 memSize, void* baaData, JKRArchive
     JASPoolAllocObject<Z2SoundHandlePool>::newMemPool(0x4e);
     OS_REPORT("[Z2AudioMgr::init]before Create Section: %d\n", heap->getFreeSize());
 
-#if TARGET_PC
-    // Fix a race condition with OS threading where JAUNewSectionHeap will use all the remaining
-    // space in the JASDram heap before JASAudioThread has finished initializing.
-
-    OSLockMutex(&JASAudioThread::sThreadInitCompleteMutex);
-    while (!JASAudioThread::sThreadInitComplete) {
-        OSWaitCond(
-            &JASAudioThread::sThreadInitCompleteCond,
-            &JASAudioThread::sThreadInitCompleteMutex);
-    }
-    OSUnlockMutex(&JASAudioThread::sThreadInitCompleteMutex);
-#endif
-
     JAUSectionHeap* sectionHeap = JAUNewSectionHeap(true);
     sectionHeap->setSeqDataArchive(seqArc);
     size_t resMaxSize = JASResArcLoader::getResMaxSize(seqArc);