ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DVDInterface: Try to enforce disc inside status on savestate load

This commit is contained in:
JosJuice 2016-09-25 10:22:35 +02:00
parent 75dd4d0aee
commit d44b2de01d
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/Core/HW/DVDInterface.cpp
View File

@ -296,6 +296,19 @@ void DoState(PointerWrap& p)
p.Do(s_stop_at_track_end); p.Do(s_stop_at_track_end);
DVDThread::DoState(p); DVDThread::DoState(p);
// s_inserted_volume isn't savestated (because it points to
// files on the local system). Instead, we check that
// s_disc_inside matches the status of s_inserted_volume.
// This won't catch cases of having the wrong disc inserted, though.
// TODO: Check the game ID, disc number, revision?
if (s_disc_inside != (s_inserted_volume != nullptr))
{
if (s_disc_inside)
PanicAlertT("An inserted disc was expected but not found.");
else
s_inserted_volume.reset();
}
} }
static u32 ProcessDTKSamples(short* tempPCM, u32 num_samples) static u32 ProcessDTKSamples(short* tempPCM, u32 num_samples)