mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-08-03 06:39:33 +00:00
Merge pull request #13718 from jordan-woyak/hardcore-deadlock
Config: Make s_callbacks_lock recursive to fix hardcore mode deadlock.
This commit is contained in:
commit
58a70db588
1 changed files with 1 additions and 1 deletions
|
@ -24,7 +24,7 @@ static std::atomic<u32> s_callback_guards = 0;
|
||||||
static std::atomic<u64> s_config_version = 0;
|
static std::atomic<u64> s_config_version = 0;
|
||||||
|
|
||||||
static std::shared_mutex s_layers_rw_lock;
|
static std::shared_mutex s_layers_rw_lock;
|
||||||
static std::mutex s_callbacks_lock;
|
static std::recursive_mutex s_callbacks_lock;
|
||||||
|
|
||||||
using ReadLock = std::shared_lock<std::shared_mutex>;
|
using ReadLock = std::shared_lock<std::shared_mutex>;
|
||||||
using WriteLock = std::unique_lock<std::shared_mutex>;
|
using WriteLock = std::unique_lock<std::shared_mutex>;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue