Merge pull request #6563 from JosJuice/fix-wii-banner-load

Fix loading Wii banners for games that initially were cached without banners

1 files changed, 6 insertions, 7 deletions

diff --git a/Source/Core/UICommon/GameFile.cpp b/Source/Core/UICommon/GameFile.cpp
index 47da5a69c5..eed5ea6710 100644
--- a/Source/Core/UICommon/GameFile.cpp
+++ b/Source/Core/UICommon/GameFile.cpp
@@ -221,14 +221,13 @@ bool GameFile::BannerChanged()
   if (!DiscIO::IsWii(m_platform))
     return false;
 
-  m_volume_banner.buffer =
-      DiscIO::WiiSaveBanner(m_title_id).GetBanner(&m_volume_banner.width, &m_volume_banner.height);
-  if (m_volume_banner.buffer.empty())
-    return false;
+  m_pending.volume_banner.buffer =
+      DiscIO::WiiSaveBanner(m_title_id)
+          .GetBanner(&m_pending.volume_banner.width, &m_pending.volume_banner.height);
 
-  // We only reach here if m_volume_banner was empty, so we can always return true
-  // without needing any extra check to know whether the banners are different
-  return true;
+  // We only reach here if the old banner was empty, so if the new banner isn't empty,
+  // the new banner is guaranteed to be different from the old banner
+  return !m_pending.volume_banner.buffer.empty();
 }
 
 void GameFile::BannerCommit()