diff options
| author |  Sebastian Valle | 2017-08-29 09:35:56 -0500 |
|---|---|---|
| committer |  GitHub | 2017-08-29 09:35:56 -0500 |
| commit | acbd46366c893537c3e63f510b8ba04adafc0c02 (patch) | |
| tree | 0b55a7ab31e9529a0c3179dc6fdb0b41eefc1dd4 /src/core/hle/lock.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/lock.cpp')
| -rw-r--r-- | src/core/hle/lock.cpp | 2 |
1 files changed, 1 insertions, 1 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 @@ | |||
| 7 | #include <core/hle/lock.h> | 7 | #include <core/hle/lock.h> |
| 8 | 8 | ||
| 9 | namespace HLE { | 9 | namespace HLE { |
| 10 | std::mutex g_hle_lock; | 10 | std::recursive_mutex g_hle_lock; |
| 11 | } | 11 | } |