From 31d0756808459de863415a26d5cf808d53678c94 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Fri, 30 May 2025 17:33:01 -0500 Subject: [PATCH] Config: Make s_callbacks_lock recursive to fix hardcore mode deadlock. --- Source/Core/Common/Config/Config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Common/Config/Config.cpp b/Source/Core/Common/Config/Config.cpp index b5aefc0e9d..62ac9e73c4 100644 --- a/Source/Core/Common/Config/Config.cpp +++ b/Source/Core/Common/Config/Config.cpp @@ -24,7 +24,7 @@ static std::atomic s_callback_guards = 0; static std::atomic s_config_version = 0; 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; using WriteLock = std::unique_lock;