From dd9155dc3041b7be116be26023c960bbe73fb601 Mon Sep 17 00:00:00 2001
From: PJB3005 <pieterjan.briers+git@gmail.com>
Date: Thu, 12 Mar 2026 14:46:44 +0100
Subject: [PATCH] Make JASMemPool_MultiThreaded use ObjectLevelLockable

Shrug I wrote this in despair debugging the previous issue. Can't hurt I guess.
---
 .../include/JSystem/JAudio2/JASHeapCtrl.h     | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/libs/JSystem/include/JSystem/JAudio2/JASHeapCtrl.h b/libs/JSystem/include/JSystem/JAudio2/JASHeapCtrl.h
index 70f63bc889..8e1381cda3 100644
--- a/libs/JSystem/include/JSystem/JAudio2/JASHeapCtrl.h
+++ b/libs/JSystem/include/JSystem/JAudio2/JASHeapCtrl.h
@@ -352,6 +352,28 @@ template <typename T> JASMemPool<T> JASPoolAllocObject<T>::memPool_;
 template <typename T>
 class JASMemPool_MultiThreaded : public JASGenericMemPool {
 public:
+#if TARGET_PC
+    OSMutex mutex;
+
+    JASMemPool_MultiThreaded() {
+        OSInitMutex(&mutex);
+    }
+
+    void newMemPool(int param_0) {
+        JASThreadingModel::ObjectLevelLockable<OSMutex>::Lock lock(mutex);
+        JASGenericMemPool::newMemPool(sizeof(T), param_0);
+    }
+
+    void* alloc(size_t count) {
+        JASThreadingModel::ObjectLevelLockable<OSMutex>::Lock lock(mutex);
+        return JASGenericMemPool::alloc(count);
+    }
+
+    void free(void* ptr, u32 param_1) {
+        JASThreadingModel::ObjectLevelLockable<OSMutex>::Lock lock(mutex);
+        JASGenericMemPool::free(ptr, param_1);
+    }
+#else
     void newMemPool(int param_0) {
         typename JASThreadingModel::InterruptsDisable<JASMemPool_MultiThreaded<T> >::Lock lock(*this);
         JASGenericMemPool::newMemPool(sizeof(T), param_0);
@@ -366,6 +388,7 @@ public:
         typename JASThreadingModel::InterruptsDisable<JASMemPool_MultiThreaded<T> >::Lock lock(*this);
         JASGenericMemPool::free(ptr, param_1);
     }
+#endif
 };
 
 /**