Merge pull request #2905 from danzel/fix-2902

Use recursive_mutex instead of mutex to fix #2902

1 files changed, 2 insertions, 2 deletions

diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index a3c5f4a9d0..097bc5b47f 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -183,7 +183,7 @@ T Read(const VAddr vaddr) {
     }
 
     // The memory access might do an MMIO or cached access, so we have to lock the HLE kernel state
-    std::lock_guard<std::mutex> lock(HLE::g_hle_lock);
+    std::lock_guard<std::recursive_mutex> lock(HLE::g_hle_lock);
 
     PageType type = current_page_table->attributes[vaddr >> PAGE_BITS];
     switch (type) {
@@ -224,7 +224,7 @@ void Write(const VAddr vaddr, const T data) {
     }
 
     // The memory access might do an MMIO or cached access, so we have to lock the HLE kernel state
-    std::lock_guard<std::mutex> lock(HLE::g_hle_lock);
+    std::lock_guard<std::recursive_mutex> lock(HLE::g_hle_lock);
 
     PageType type = current_page_table->attributes[vaddr >> PAGE_BITS];
     switch (type) {