diff options
| author | 2017-08-29 09:35:56 -0500 | |
|---|---|---|
| committer | 2017-08-29 09:35:56 -0500 | |
| commit | acbd46366c893537c3e63f510b8ba04adafc0c02 (patch) | |
| tree | 0b55a7ab31e9529a0c3179dc6fdb0b41eefc1dd4 /src/core/hle/svc.cpp | |
| parent | Merge pull request #2901 from stone3311/master (diff) | |
| parent | Use recursive_mutex instead of mutex to fix #2902 (diff) | |
| download | yuzu-acbd46366c893537c3e63f510b8ba04adafc0c02.tar.gz yuzu-acbd46366c893537c3e63f510b8ba04adafc0c02.tar.xz yuzu-acbd46366c893537c3e63f510b8ba04adafc0c02.zip | |
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) { | |||
| 1334 | MICROPROFILE_SCOPE(Kernel_SVC); | 1334 | MICROPROFILE_SCOPE(Kernel_SVC); |
| 1335 | 1335 | ||
| 1336 | // Lock the global kernel mutex when we enter the kernel HLE. | 1336 | // Lock the global kernel mutex when we enter the kernel HLE. |
| 1337 | std::lock_guard<std::mutex> lock(HLE::g_hle_lock); | 1337 | std::lock_guard<std::recursive_mutex> lock(HLE::g_hle_lock); |
| 1338 | 1338 | ||
| 1339 | const FunctionDef* info = GetSVCInfo(immediate); | 1339 | const FunctionDef* info = GetSVCInfo(immediate); |
| 1340 | if (info) { | 1340 | if (info) { |