Skip to content

Commit 30f5e6d

Browse files
committed
Relocated missing iso check to CdlID delayed interrupt
1 parent dce6c4d commit 30f5e6d

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

src/core/cdrom.cc

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -917,6 +917,15 @@ class CDRomImpl : public PCSX::CDRom {
917917

918918
case CdlID + 0x100:
919919
SetResultSize(8);
920+
921+
if (!m_iso.isActive()) {
922+
m_result[0] = 0x08;
923+
m_result[1] = 0x40;
924+
memset((char *)&m_result[2], 0, 6);
925+
m_stat = DiskError;
926+
break;
927+
}
928+
920929
m_result[0] = m_statP;
921930
m_result[1] = 0;
922931
m_result[2] = 0;
@@ -1049,12 +1058,12 @@ class CDRomImpl : public PCSX::CDRom {
10491058
}
10501059

10511060
if (!no_busy_error) {
1052-
if (!m_iso.isActive()) {
1061+
/* if (!m_iso.isActive()) {
10531062
SetResultSize(2);
10541063
m_result[0] = m_statP | STATUS_ERROR;
10551064
m_result[1] = ERROR_NOTREADY;
10561065
m_stat = DiskError;
1057-
} else {
1066+
} else {*/
10581067
switch (m_driveState) {
10591068
case DRIVESTATE_LID_OPEN:
10601069
case DRIVESTATE_RESCAN_CD:
@@ -1065,7 +1074,7 @@ class CDRomImpl : public PCSX::CDRom {
10651074
m_stat = DiskError;
10661075
break;
10671076
}
1068-
}
1077+
//}
10691078
}
10701079

10711080
finish:

0 commit comments

Comments
 (0)