Merge pull request #7504 from JosJuice/game-id-partition-none

Fix issue 11422 (inconsistent game ID for some hacked games)
dolphin-emu · Oct 25, 2018 · 74c49c9 · 74c49c9
2 parents 748b275 + 03d4011
commit 74c49c9
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp
@@ -655,9 +655,17 @@ void SConfig::ResetRunningGameMetadata()
 void SConfig::SetRunningGameMetadata(const DiscIO::Volume& volume,
                                      const DiscIO::Partition& partition)
 {
-  SetRunningGameMetadata(volume.GetGameID(partition), volume.GetTitleID(partition).value_or(0),
-                         volume.GetRevision(partition).value_or(0),
-                         Core::TitleDatabase::TitleType::Other);
+  if (partition == volume.GetGamePartition())
+  {
+    SetRunningGameMetadata(volume.GetGameID(), volume.GetTitleID().value_or(0),
+                           volume.GetRevision().value_or(0), Core::TitleDatabase::TitleType::Other);
+  }
+  else
+  {
+    SetRunningGameMetadata(volume.GetGameID(partition), volume.GetTitleID(partition).value_or(0),
+                           volume.GetRevision(partition).value_or(0),
+                           Core::TitleDatabase::TitleType::Other);
+  }
 }
 
 void SConfig::SetRunningGameMetadata(const IOS::ES::TMDReader& tmd)