From 83c108836bc2d4d31607f1ea6ed00d2fd29e9439 Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Fri, 3 Mar 2017 11:17:59 +0100 Subject: [PATCH] Fix a hang/crash when using the Windows GE debugger --- Core/MemMap.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/MemMap.cpp b/Core/MemMap.cpp index 2ba4bf74de..398cead011 100644 --- a/Core/MemMap.cpp +++ b/Core/MemMap.cpp @@ -78,7 +78,7 @@ u32 g_MemorySize; // Used to store the PSP model on game startup. u32 g_PSPModel; -std::mutex g_shutdownLock; +std::recursive_mutex g_shutdownLock; // We don't declare the IO region in here since its handled by other means. static MemoryView views[] = @@ -316,7 +316,7 @@ void DoState(PointerWrap &p) { } void Shutdown() { - std::lock_guard guard(g_shutdownLock); + std::lock_guard guard(g_shutdownLock); u32 flags = 0; MemoryMap_Shutdown(flags); base = nullptr;