Merge pull request #663 from bslenul/rumble-fix

[pcsx_rearmed.git] / libpcsxcore / cdrom.c

diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index 4b3e263..5a556a0 100644 (file)
--- 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;
                        }