Merge pull request #5522 from leoetlino/simpler-gettitleid

DiscIO: Use std::optional for GetTitleID instead of pointer
This commit is contained in:
JosJuice
2017-06-04 08:57:36 +02:00
committed by GitHub
9 changed files with 31 additions and 26 deletions

View File

@ -161,7 +161,8 @@ bool GameFile::TryLoadVolume()
m_game_id = QString::fromStdString(volume->GetGameID());
std::string maker_id = volume->GetMakerID();
volume->GetTitleID(&m_title_id);
if (std::optional<u64> title_id = volume->GetTitleID())
m_title_id = *title_id;
m_maker = QString::fromStdString(DiscIO::GetCompanyFromID(maker_id));
m_maker_id = QString::fromStdString(maker_id);
m_revision = volume->GetRevision();