Merge pull request #13496 from TryTwo/PR_GameSettings_Fix

Game config settings: Show global value when no game setting exists.

1 files changed, 9 insertions, 1 deletions

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 <typename T>
   const T ReadValue(const Config::Info<T>& 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);
   }