From fb922781e7c06c3d5e7617c0b6bc4244662cfda0 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sat, 4 Jul 2020 14:55:15 +0200 Subject: [PATCH] RedumpVerifier: Treat Datel game IDs as empty Replacement for the reverted commit f9705fd1176432755df3dba0ef5c50f505193371. --- Source/Core/DiscIO/VolumeVerifier.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Source/Core/DiscIO/VolumeVerifier.cpp b/Source/Core/DiscIO/VolumeVerifier.cpp index 6a620131fb..9a8617c166 100644 --- a/Source/Core/DiscIO/VolumeVerifier.cpp +++ b/Source/Core/DiscIO/VolumeVerifier.cpp @@ -56,11 +56,12 @@ RedumpVerifier::DownloadState RedumpVerifier::m_wii_download_state; void RedumpVerifier::Start(const Volume& volume) { - // We use GetGameTDBID instead of GetGameID so that Datel discs will be represented by an empty - // string, which matches Redump not having any serials for Datel discs. - m_game_id = volume.GetGameTDBID(); - if (m_game_id.size() > 4) - m_game_id = m_game_id.substr(0, 4); + if (!volume.IsDatelDisc()) + { + m_game_id = volume.GetGameID(); + if (m_game_id.size() > 4) + m_game_id = m_game_id.substr(0, 4); + } m_revision = volume.GetRevision().value_or(0); m_disc_number = volume.GetDiscNumber().value_or(0);