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
commit 703858e217
9 changed files with 31 additions and 26 deletions

View file

@ -719,9 +719,10 @@ void SConfig::ResetRunningGameMetadata()
void SConfig::SetRunningGameMetadata(const DiscIO::IVolume& volume,
const DiscIO::Partition& partition)
{
u64 title_id = 0;
volume.GetTitleID(&title_id, partition);
SetRunningGameMetadata(volume.GetGameID(partition), title_id, volume.GetRevision(partition),
const std::optional<u64> title_id = volume.GetTitleID(partition);
if (!title_id)
return;
SetRunningGameMetadata(volume.GetGameID(partition), *title_id, volume.GetRevision(partition),
Core::TitleDatabase::TitleType::Other);
}