From 8904117bebc7eefb9b6cb60db4d6d410db0755c1 Mon Sep 17 00:00:00 2001 From: cbartondock Date: Tue, 3 Mar 2026 11:40:26 -0800 Subject: [PATCH] use elf id if set otherwise use dol id --- Source/Core/Core/ConfigManager.cpp | 1 + Source/Core/VideoCommon/HiresTextures.cpp | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp index 14934a42ac..d48880fe3f 100644 --- a/Source/Core/Core/ConfigManager.cpp +++ b/Source/Core/Core/ConfigManager.cpp @@ -164,6 +164,7 @@ void SConfig::ResetRunningGameMetadata() { std::lock_guard lock(m_metadata_lock); SetRunningGameMetadata("00000000", "", 0, 0, DiscIO::Region::Unknown); + SetElfDolID(""); } void SConfig::SetRunningGameMetadata(const DiscIO::Volume& volume, diff --git a/Source/Core/VideoCommon/HiresTextures.cpp b/Source/Core/VideoCommon/HiresTextures.cpp index ce6ea0675b..8be71fa749 100644 --- a/Source/Core/VideoCommon/HiresTextures.cpp +++ b/Source/Core/VideoCommon/HiresTextures.cpp @@ -88,8 +88,12 @@ void HiresTexture::Update() const std::string& game_id_elf_dol = SConfig::GetInstance().GetGameIDElfDol(); OSD::AddMessage(fmt::format("Game ID '{}' used to load textures", game_id), 10000); OSD::AddMessage(fmt::format("ELF/DOL Game ID '{}'", game_id_elf_dol), 10000); + + + // If there is an elf/dol id, use that. Otherwise, fallback to the game id. const std::set texture_directories = - GetTextureDirectoriesWithGameId(File::GetUserPath(D_HIRESTEXTURES_IDX), game_id); + GetTextureDirectoriesWithGameId(File::GetUserPath(D_HIRESTEXTURES_IDX), game_id_elf_dol.length() > 0 ? game_id_elf_dol : game_id); + constexpr auto extensions = std::to_array({".png", ".dds"}); for (const auto& texture_directory : texture_directories)