diff options
author | Sebastian Valle <subv2112@gmail.com> | 2017-08-29 16:35:56 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-29 16:35:56 +0200 |
commit | acbd46366c893537c3e63f510b8ba04adafc0c02 (patch) | |
tree | 0b55a7ab31e9529a0c3179dc6fdb0b41eefc1dd4 /src/core/hle | |
parent | Merge pull request #2901 from stone3311/master (diff) | |
parent | Use recursive_mutex instead of mutex to fix #2902 (diff) | |
download | yuzu-acbd46366c893537c3e63f510b8ba04adafc0c02.tar yuzu-acbd46366c893537c3e63f510b8ba04adafc0c02.tar.gz yuzu-acbd46366c893537c3e63f510b8ba04adafc0c02.tar.bz2 yuzu-acbd46366c893537c3e63f510b8ba04adafc0c02.tar.lz yuzu-acbd46366c893537c3e63f510b8ba04adafc0c02.tar.xz yuzu-acbd46366c893537c3e63f510b8ba04adafc0c02.tar.zst yuzu-acbd46366c893537c3e63f510b8ba04adafc0c02.zip |
Diffstat (limited to 'src/core/hle')
-rw-r--r-- | src/core/hle/lock.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/lock.h | 2 | ||||
-rw-r--r-- | src/core/hle/svc.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/lock.cpp b/src/core/hle/lock.cpp index 082f689c8..1c24c7ce9 100644 --- a/src/core/hle/lock.cpp +++ b/src/core/hle/lock.cpp @@ -7,5 +7,5 @@ #include <core/hle/lock.h> namespace HLE { -std::mutex g_hle_lock; +std::recursive_mutex g_hle_lock; } diff --git a/src/core/hle/lock.h b/src/core/hle/lock.h index 8265621e1..5c99fe996 100644 --- a/src/core/hle/lock.h +++ b/src/core/hle/lock.h @@ -14,5 +14,5 @@ namespace HLE { * to the emulated memory is not protected by this mutex, and should be avoided in any threads other * than the CPU thread. */ -extern std::mutex g_hle_lock; +extern std::recursive_mutex g_hle_lock; } // namespace HLE diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index b98938cb4..dfc36748c 100644 --- a/src/core/hle/svc.cpp +++ b/src/core/hle/svc.cpp @@ -1334,7 +1334,7 @@ void CallSVC(u32 immediate) { MICROPROFILE_SCOPE(Kernel_SVC); // Lock the global kernel mutex when we enter the kernel HLE. - std::lock_guard<std::mutex> lock(HLE::g_hle_lock); + std::lock_guard<std::recursive_mutex> lock(HLE::g_hle_lock); const FunctionDef* info = GetSVCInfo(immediate); if (info) { |