diff options
Diffstat (limited to 'Source/Core/DiscIO/VolumeWiiCrypted.cpp')
| -rw-r--r-- | Source/Core/DiscIO/VolumeWiiCrypted.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.cpp b/Source/Core/DiscIO/VolumeWiiCrypted.cpp index 411879e6c3..9281529254 100644 --- a/Source/Core/DiscIO/VolumeWiiCrypted.cpp +++ b/Source/Core/DiscIO/VolumeWiiCrypted.cpp @@ -181,13 +181,12 @@ Partition CVolumeWiiCrypted::GetGamePartition() const return m_game_partition; } -bool CVolumeWiiCrypted::GetTitleID(u64* buffer, const Partition& partition) const +std::optional<u64> CVolumeWiiCrypted::GetTitleID(const Partition& partition) const { const IOS::ES::TicketReader& ticket = GetTicket(partition); if (!ticket.IsValid()) - return false; - *buffer = ticket.GetTitleId(); - return true; + return {}; + return ticket.GetTitleId(); } const IOS::ES::TicketReader& CVolumeWiiCrypted::GetTicket(const Partition& partition) const @@ -289,11 +288,11 @@ std::vector<u32> CVolumeWiiCrypted::GetBanner(int* width, int* height) const *width = 0; *height = 0; - u64 title_id; - if (!GetTitleID(&title_id, GetGamePartition())) + const std::optional<u64> title_id = GetTitleID(GetGamePartition()); + if (!title_id) return std::vector<u32>(); - return GetWiiBanner(width, height, title_id); + return GetWiiBanner(width, height, *title_id); } u64 CVolumeWiiCrypted::GetFSTSize(const Partition& partition) const |