From c3fa0d6edf0ed65acdf789debed57cd4aa7955ba Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sun, 4 Jun 2017 10:33:14 +0200 Subject: DiscIO: Use std::optional in Volume and Blob --- Source/Core/DolphinWX/ISOFile.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Source/Core/DolphinWX/ISOFile.cpp') diff --git a/Source/Core/DolphinWX/ISOFile.cpp b/Source/Core/DolphinWX/ISOFile.cpp index 75956e1845..28bdb261f7 100644 --- a/Source/Core/DolphinWX/ISOFile.cpp +++ b/Source/Core/DolphinWX/ISOFile.cpp @@ -108,10 +108,9 @@ GameListItem::GameListItem(const std::string& _rFileName, const Core::TitleDatab m_VolumeSize = volume->GetSize(); m_game_id = volume->GetGameID(); - if (std::optional title_id = volume->GetTitleID()) - m_title_id = *title_id; - m_disc_number = volume->GetDiscNumber(); - m_Revision = volume->GetRevision(); + m_title_id = volume->GetTitleID().value_or(0); + m_disc_number = volume->GetDiscNumber().value_or(0); + m_Revision = volume->GetRevision().value_or(0); std::vector buffer = volume->GetBanner(&m_ImageWidth, &m_ImageHeight); ReadVolumeBanner(buffer, m_ImageWidth, m_ImageHeight); -- cgit v1.2.3