From 0bcb9923f8eb53298428470cc29dfaf05d7a0237 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sun, 30 Sep 2018 17:45:18 +0200 Subject: [PATCH] Fix reading title IDs of Wii discs Partial revert of a1db82a. Should fix https://bugs.dolphin-emu.org/issues/11404. --- Source/Core/DiscIO/Volume.h | 6 ++---- Source/Core/UICommon/GameFileCache.cpp | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Source/Core/DiscIO/Volume.h b/Source/Core/DiscIO/Volume.h index 60bfd137a0..341c64a23c 100644 --- a/Source/Core/DiscIO/Volume.h +++ b/Source/Core/DiscIO/Volume.h @@ -62,10 +62,8 @@ public: virtual std::vector GetPartitions() const { return {}; } virtual Partition GetGamePartition() const { return PARTITION_NONE; } virtual std::optional GetPartitionType(const Partition& partition) const { return {}; } - virtual std::optional GetTitleID(const Partition& partition = PARTITION_NONE) const - { - return {}; - } + std::optional GetTitleID() const { return GetTitleID(GetGamePartition()); } + virtual std::optional GetTitleID(const Partition& partition) const { return {}; } virtual const IOS::ES::TicketReader& GetTicket(const Partition& partition) const { return INVALID_TICKET; diff --git a/Source/Core/UICommon/GameFileCache.cpp b/Source/Core/UICommon/GameFileCache.cpp index c1790f5b59..282dcd0ee8 100644 --- a/Source/Core/UICommon/GameFileCache.cpp +++ b/Source/Core/UICommon/GameFileCache.cpp @@ -27,7 +27,7 @@ namespace UICommon { -static constexpr u32 CACHE_REVISION = 13; // Last changed in PR 7411 +static constexpr u32 CACHE_REVISION = 14; // Last changed in PR 7441 std::vector FindAllGamePaths(const std::vector& directories_to_scan, bool recursive_scan)