sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

System: Use existing CD media when loading state where possible

Browse Source
This commit is contained in:
Connor McLaughlin
2020-07-22 00:02:37 +10:00
parent 0398c6cb4a
commit 93528db388
5 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/system.cpp
View File

@ -432,11 +432,17 @@ bool System::DoLoadState(ByteStream* state, bool init_components, bool force_sof
return false;
}
media = CDImage::Open(media_filename.c_str());
if (!media)
media = m_cdrom->RemoveMedia();
if (!media || media->GetFileName() != media_filename)
{
m_host_interface->ReportFormattedError("Failed to open CD image from save state: '%s'.", media_filename.c_str());
return false;
media.reset();
media = CDImage::Open(media_filename.c_str());
if (!media)
{
m_host_interface->ReportFormattedError("Failed to open CD image from save state: '%s'.",
media_filename.c_str());
return false;
}
}
}