From 91380258a1254c0f31f767458137cbf18d791fca Mon Sep 17 00:00:00 2001 From: TryTwo Date: Mon, 7 Apr 2025 20:41:46 -0700 Subject: [PATCH] GameConfig Settings: If no game setting exists for a certain option, then show the global setting value. Previously showed the default value if the game setting didn't exist. --- .../DolphinQt/Config/ConfigControls/ConfigControl.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Source/Core/DolphinQt/Config/ConfigControls/ConfigControl.h b/Source/Core/DolphinQt/Config/ConfigControls/ConfigControl.h index 508426d258..ee2f98d73d 100644 --- a/Source/Core/DolphinQt/Config/ConfigControls/ConfigControl.h +++ b/Source/Core/DolphinQt/Config/ConfigControls/ConfigControl.h @@ -76,8 +76,16 @@ protected: template const T ReadValue(const Config::Info& setting) const { + // For loading game specific settings. If the game setting doesn't exist, load the current + // global setting. There's no way to know what game is being edited, so GlobalGame settings + // can't be shown, but otherwise would be good to include. if (m_layer != nullptr) - return m_layer->Get(setting); + { + if (m_layer->Exists(m_location)) + return m_layer->Get(setting); + else + return Config::GetBase(setting); + } return Config::Get(setting); }