From 9ffd345df03853cd37a392f2f19dc7bac889158e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Tue, 29 Dec 2020 19:46:41 +0100 Subject: [PATCH] Config: Fix cache not being invalidated when callbacks are suppressed The config version should always be incremented whenever config is changed, regardless of callbacks being suppressed or not. Otherwise, getters can return stale data until another config change (with callbacks enabled) happens. --- Source/Core/Common/Config/Config.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Source/Core/Common/Config/Config.cpp b/Source/Core/Common/Config/Config.cpp index 071d009b51..c75b6ee5e9 100644 --- a/Source/Core/Common/Config/Config.cpp +++ b/Source/Core/Common/Config/Config.cpp @@ -71,11 +71,14 @@ void AddConfigChangedCallback(ConfigChangedCallback func) void OnConfigChanged() { + // Increment the config version to invalidate caches. + // To ensure that getters do not return stale data, this should always be done + // even when callbacks are suppressed. + s_config_version.fetch_add(1, std::memory_order_relaxed); + if (s_callback_guards) return; - s_config_version.fetch_add(1, std::memory_order_relaxed); - for (const auto& callback : s_callbacks) callback(); }