X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=libpcsxcore%2Fcdrom.c;h=5a556a0a1f5b09fccae4516be26002ff77fe1359;hb=24e7afe0f5ce84f651b28a5f3832f8affdb0ee7c;hp=4b3e263bf35714103553082c7bf447636fa350b5;hpb=084b0f3124704b5e866ac82b1e4a676d4c1ad074;p=pcsx_rearmed.git

diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index 4b3e263b..5a556a0a 100644
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -686,6 +686,7 @@ void cdrInterrupt() {
 			ReadTrack(cdr.SetSectorPlay);
 			cdr.TrackChanged = FALSE;
 
+			StopReading();
 			if (!Config.Cdda)
 				CDR_play();
 
@@ -774,7 +775,7 @@ void cdrInterrupt() {
 			 * 
 			 * We will need to get around this for Bedlam/Rise 2 later...
 			 * */
-			if (cdr.DriveState != DRIVESTATE_STANDBY)
+			if (cdr.DriveState == DRIVESTATE_STANDBY)
 			{
 				delay = 7000;
 			}
@@ -1491,7 +1492,7 @@ void psxDma3(u32 madr, u32 bcr, u32 chcr) {
 
 
 			ptr = (u8 *)PSXM(madr);
-			if (ptr == NULL) {
+			if (ptr == INVALID_PTR) {
 				CDR_LOG("psxDma3() Log: *** DMA 3 *** NULL Pointer!\n");
 				break;
 			}