From cc42b4354d38055629ba3eeac92fa57582a26de0 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sat, 10 Mar 2018 22:41:49 +0100 Subject: Reimplement custom PNG banners in game list Fixes https://bugs.dolphin-emu.org/issues/10938 and makes PNG banners available in DolphinQt2 for the first time. --- Source/Core/UICommon/GameFileCache.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'Source/Core/UICommon/GameFileCache.cpp') diff --git a/Source/Core/UICommon/GameFileCache.cpp b/Source/Core/UICommon/GameFileCache.cpp index 9c18b78e81..9dc25740f9 100644 --- a/Source/Core/UICommon/GameFileCache.cpp +++ b/Source/Core/UICommon/GameFileCache.cpp @@ -28,7 +28,7 @@ namespace UICommon { -static constexpr u32 CACHE_REVISION = 9; // Last changed in PR 6569 +static constexpr u32 CACHE_REVISION = 10; // Last changed in PR 6429 std::vector FindAllGamePaths(const std::vector& directories_to_scan, bool recursive_scan) @@ -138,17 +138,20 @@ bool GameFileCache::UpdateAdditionalMetadata(const Core::TitleDatabase& title_da bool GameFileCache::UpdateAdditionalMetadata(std::shared_ptr* game_file, const Core::TitleDatabase& title_database) { - const bool banner_changed = (*game_file)->BannerChanged(); + const bool wii_banner_changed = (*game_file)->WiiBannerChanged(); + const bool custom_banner_changed = (*game_file)->CustomBannerChanged(); const bool custom_title_changed = (*game_file)->CustomNameChanged(title_database); - if (!banner_changed && !custom_title_changed) + if (!wii_banner_changed && !custom_banner_changed && !custom_title_changed) return false; // If a cached file needs an update, apply the updates to a copy and delete the original. // This makes the usage of cached files in other threads safe. std::shared_ptr copy = std::make_shared(**game_file); - if (banner_changed) - copy->BannerCommit(); + if (wii_banner_changed) + copy->WiiBannerCommit(); + if (custom_banner_changed) + copy->CustomBannerCommit(); if (custom_title_changed) copy->CustomNameCommit(); *game_file = std::move(copy); -- cgit v1.2.3