From 9db4067957729040f6100399d206f8a471d131b7 Mon Sep 17 00:00:00 2001 From: Dentomologist Date: Fri, 25 Apr 2025 12:05:35 -0700 Subject: [PATCH] UICommon: Merge ConfigChangedCallbacks Use a single lambda as a callback which calls InitCustomPaths and RefreshConfig instead of having separate callbacks for each of them. This fixes the callback for InitCustomPaths not being removed on shutdown; the callback for the lambda (previously for RefreshConfig) is already removed in Shutdown(). --- Source/Core/UICommon/UICommon.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Source/Core/UICommon/UICommon.cpp b/Source/Core/UICommon/UICommon.cpp index e4f79a6a6a..f1e19d2292 100644 --- a/Source/Core/UICommon/UICommon.cpp +++ b/Source/Core/UICommon/UICommon.cpp @@ -130,14 +130,17 @@ void Init() Core::RestoreWiiSettings(Core::RestoreReason::CrashRecovery); Config::Init(); - Config::AddConfigChangedCallback(InitCustomPaths); + const auto config_changed_callback = []() { + InitCustomPaths(); + RefreshConfig(); + }; + s_config_changed_callback_id = Config::AddConfigChangedCallback(config_changed_callback); Config::AddLayer(ConfigLoaders::GenerateBaseConfigLoader()); SConfig::Init(); Discord::Init(); Common::Log::LogManager::Init(); VideoBackendBase::ActivateBackend(Config::Get(Config::MAIN_GFX_BACKEND)); - s_config_changed_callback_id = Config::AddConfigChangedCallback(RefreshConfig); RefreshConfig(); }