Merge pull request #11641 from JosJuice/android-remove-old-config

Android: Remove support for the old config system

5 files changed, 9 insertions, 2 deletions

diff --git a/Source/Core/Common/Config/Config.cpp b/Source/Core/Common/Config/Config.cpp
index 67b21ea33b..4a55ab5b7b 100644
--- a/Source/Core/Common/Config/Config.cpp
+++ b/Source/Core/Common/Config/Config.cpp
@@ -159,7 +159,8 @@ static const std::map<System, std::string> system_to_name = {
     {System::SYSCONF, "SYSCONF"},
     {System::DualShockUDPClient, "DualShockUDPClient"},
     {System::FreeLook, "FreeLook"},
-    {System::Session, "Session"}};
+    {System::Session, "Session"},
+    {System::GameSettingsOnly, "GameSettingsOnly"}};
 
 const std::string& GetSystemName(System system)
 {
diff --git a/Source/Core/Common/Config/Enums.h b/Source/Core/Common/Config/Enums.h
index 8f224e50d6..1f6d0a1966 100644
--- a/Source/Core/Common/Config/Enums.h
+++ b/Source/Core/Common/Config/Enums.h
@@ -33,6 +33,7 @@ enum class System
   DualShockUDPClient,
   FreeLook,
   Session,
+  GameSettingsOnly,
 };
 
 constexpr std::array<LayerType, 7> SEARCH_ORDER{{
diff --git a/Source/Core/Core/ConfigLoaders/BaseConfigLoader.cpp b/Source/Core/Core/ConfigLoaders/BaseConfigLoader.cpp
index 7b9d1c2782..acce10521b 100644
--- a/Source/Core/Core/ConfigLoaders/BaseConfigLoader.cpp
+++ b/Source/Core/Core/ConfigLoaders/BaseConfigLoader.cpp
@@ -159,6 +159,9 @@ public:
       if (location.system == Config::System::Session)
         continue;
 
+      if (location.system == Config::System::GameSettingsOnly)
+        continue;
+
       auto ini = inis.find(location.system);
       if (ini == inis.end())
       {
diff --git a/Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp b/Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp
index 62fe3e5968..7b6466b20f 100644
--- a/Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp
+++ b/Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp
@@ -104,6 +104,7 @@ static const INIToSectionMap& GetINIToSectionMap()
       {"Video_Stereoscopy", {Config::System::GFX, "Stereoscopy"}},
       {"Video_Hacks", {Config::System::GFX, "Hacks"}},
       {"Video", {Config::System::GFX, "GameSpecific"}},
+      {"Controls", {Config::System::GameSettingsOnly, "Controls"}},
   };
   return ini_to_section;
 }
diff --git a/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp b/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp
index 01e278d576..d7746baa41 100644
--- a/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp
+++ b/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp
@@ -18,7 +18,8 @@ bool IsSettingSaveable(const Config::Location& config_location)
 {
   for (Config::System system :
        {Config::System::SYSCONF, Config::System::GFX, Config::System::DualShockUDPClient,
-        Config::System::Logger, Config::System::FreeLook, Config::System::Main})
+        Config::System::Logger, Config::System::FreeLook, Config::System::Main,
+        Config::System::GameSettingsOnly})
   {
     if (config_location.system == system)
       return true;