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/lock.h | |
| 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/lock.h')
| -rw-r--r-- | src/core/hle/lock.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 |