diff options
| author | Sebastian Valle <subv2112@gmail.com> | 2017-08-29 09:35:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-29 09:35:56 -0500 |
| commit | acbd46366c893537c3e63f510b8ba04adafc0c02 (patch) | |
| tree | 0b55a7ab31e9529a0c3179dc6fdb0b41eefc1dd4 /src/core/hle/svc.cpp | |
| parent | 4693d23efb2a03b844946358bde86d5fddb791ab (diff) | |
| parent | 826606479682234c98e4dfa6e616e637a28d4fcc (diff) | |
Merge pull request #2905 from danzel/fix-2902
Use recursive_mutex instead of mutex to fix #2902
Diffstat (limited to 'src/core/hle/svc.cpp')
| -rw-r--r-- | src/core/hle/svc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |