summaryrefslogtreecommitdiff
path: root/Source/Core/DiscIO/VolumeGC.cpp
diff options
context:
space:
mode:
authorTilka <tilkax@gmail.com>2020-07-04 14:07:46 +0100
committerGitHub <noreply@github.com>2020-07-04 14:07:46 +0100
commitc5a38826172d3d37a29f7a275c0007400c2fde07 (patch)
tree1f6ea8e52094c981d31e62688e206f8f6d8239d9 /Source/Core/DiscIO/VolumeGC.cpp
parent9c12a843f86d39bc64d9e9b5b670e67455487739 (diff)
parentfb922781e7c06c3d5e7617c0b6bc4244662cfda0 (diff)
Merge pull request #8929 from JosJuice/datel-covers
DiscIO: Fix downloading covers for non-GNHE5d Datel discs
Diffstat (limited to 'Source/Core/DiscIO/VolumeGC.cpp')
-rw-r--r--Source/Core/DiscIO/VolumeGC.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp
index 83b0d3dd00..15d71c74ca 100644
--- a/Source/Core/DiscIO/VolumeGC.cpp
+++ b/Source/Core/DiscIO/VolumeGC.cpp
@@ -59,11 +59,10 @@ const FileSystem* VolumeGC::GetFileSystem(const Partition& partition) const
std::string VolumeGC::GetGameTDBID(const Partition& partition) const
{
- // Don't return an ID for Datel discs
- if (!GetBootDOLOffset(*this, PARTITION_NONE).has_value())
- return "";
+ const std::string game_id = GetGameID(partition);
- return GetGameID(partition);
+ // Don't return an ID for Datel discs that are using the game ID of NHL Hitz 2002
+ return game_id == "GNHE5d" && IsDatelDisc() ? "" : game_id;
}
Region VolumeGC::GetRegion() const
@@ -133,6 +132,11 @@ Platform VolumeGC::GetVolumeType() const
return Platform::GameCubeDisc;
}
+bool VolumeGC::IsDatelDisc() const
+{
+ return !GetBootDOLOffset(*this, PARTITION_NONE).has_value();
+}
+
VolumeGC::ConvertedGCBanner VolumeGC::LoadBannerFile() const
{
GCBanner banner_file;