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

It might be a good idea to notify the emulator that the disc changed on a disc swap. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5886 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
ramapcsx2.code 2014-02-07 10:02:53 +00:00
parent 0403bd8c3c
commit 749568f290
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pcsx2/CDVD/CDVD.cpp
View File

@ -499,6 +499,13 @@ s32 cdvdReadSubQ(s32 lsn, cdvdSubQ* subq)
return ret;
}
static void cdvdDetectDisk()
{
wxString str;
cdvd.Type = DoCDVDdetectDiskType();
cdvdReloadElfInfo();
}
s32 cdvdCtrlTrayOpen()
{
DevCon.WriteLn( Color_Green, L"Open virtual disk tray");
@ -515,6 +522,10 @@ s32 cdvdCtrlTrayClose()
cdvd.Status = CDVD_STATUS_PAUSE;
cdvd.Ready = CDVD_READY1;
cdvd.TrayTimeout = 0; // Reset so it can't get closed twice by cdvdVsync()
cdvdDetectDisk();
GetCoreThread().ApplySettings(g_Conf->EmuOptions);
return 0; // needs to be 0 for success according to homebrew test "CDVD"
}
@ -611,13 +622,6 @@ void SaveStateBase::cdvdFreeze()
}
}
static void cdvdDetectDisk()
{
wxString str;
cdvd.Type = DoCDVDdetectDiskType();
cdvdReloadElfInfo();
}
void cdvdNewDiskCB()
{
ScopedTryLock lock( Mutex_NewDiskCB );