Merge pull request #14436 from cbartondock/master

Loading custom textures using combination of elf/dol game ids and iso game ids.

1 files changed, 5 insertions, 6 deletions

diff --git a/Source/Core/InputCommon/DynamicInputTextureManager.cpp b/Source/Core/InputCommon/DynamicInputTextureManager.cpp
index be5c963409..47d50524de 100644
--- a/Source/Core/InputCommon/DynamicInputTextureManager.cpp
+++ b/Source/Core/InputCommon/DynamicInputTextureManager.cpp
@@ -23,10 +23,9 @@ DynamicInputTextureManager::~DynamicInputTextureManager() = default;
 void DynamicInputTextureManager::Load()
 {
   m_configuration.clear();
-
-  const std::string& game_id = SConfig::GetInstance().GetGameID();
   const std::set<std::string> dynamic_input_directories =
-      GetTextureDirectoriesWithGameId(File::GetUserPath(D_DYNAMICINPUT_IDX), game_id);
+      GetTextureDirectoriesForFirstMatchingGameId(File::GetUserPath(D_DYNAMICINPUT_IDX),
+                                                  SConfig::GetInstance().GetGameIDsForTextures());
 
   for (const auto& dynamic_input_directory : dynamic_input_directories)
   {
@@ -46,8 +45,8 @@ void DynamicInputTextureManager::GenerateTextures(const Common::IniFile& file,
   {
     configuration.GenerateTextures(file, controller_names, &output);
   }
-
-  const std::string& game_id = SConfig::GetInstance().GetGameID();
+  // write to highest preference gameid for textures
+  const std::string& game_id_for_textures = SConfig::GetInstance().GetGameIDForTextures();
   for (const auto& [generated_folder_name, images] : output)
   {
     const auto hi_res_folder = File::GetUserPath(D_HIRESTEXTURES_IDX) + generated_folder_name;
@@ -63,7 +62,7 @@ void DynamicInputTextureManager::GenerateTextures(const Common::IniFile& file,
       File::CreateDir(game_id_folder);
     }
 
-    File::CreateEmptyFile(game_id_folder + DIR_SEP + game_id + ".txt");
+    File::CreateEmptyFile(game_id_folder + DIR_SEP + game_id_for_textures + ".txt");
 
     for (const auto& [image_name, image] : images)
     {