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

CDVD: Fix tray closure on No Disc

This commit is contained in:
refractionpcsx2 2021-10-14 22:22:37 +01:00
parent d736c8b281
commit f14c9e7ddd
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pcsx2/CDVD/CDVD.cpp
View File

@ -602,7 +602,7 @@ s32 cdvdCtrlTrayOpen()
cdvd.mediaChanged = true;
if (cdvd.Type > 0)
if (cdvd.Type > 0 || CDVDsys_GetSourceType() == CDVD_SourceType::NoDisc)
{
cdvd.Tray.cdvdActionSeconds = 3;
cdvd.Tray.trayState = CDVD_DISC_EJECT;
@ -678,7 +678,10 @@ static int cdvdTrayStateDetecting()
return CDVD_TYPE_DETCTDVDS;
}
return CDVD_TYPE_DETCTCD;
if(cdvd.Type != CDVD_TYPE_NODISC)
return CDVD_TYPE_DETCTCD;
else
return CDVD_TYPE_DETCT; //Detecting any kind of disc existing
}
static uint cdvdRotationalLatency(CDVD_MODE_TYPE mode)
{
@ -1273,11 +1276,16 @@ void cdvdUpdateTrayState()
break;
case CDVD_DISC_SEEKING:
case CDVD_DISC_ENGAGED:
cdvd.mediaChanged = true;
DevCon.WriteLn(Color_Green, L"Media ready to read");
cdvd.Tray.trayState = CDVD_DISC_ENGAGED;
cdvd.Status = CDVD_STATUS_PAUSE;
cdvd.Ready |= CDVD_DRIVE_READY;
if (CDVDsys_GetSourceType() != CDVD_SourceType::NoDisc)
{
DevCon.WriteLn(Color_Green, L"Media ready to read");
cdvd.mediaChanged = true;
cdvd.Status = CDVD_STATUS_PAUSE;
}
else
cdvd.Status = CDVD_STATUS_STOP;
break;
}
}