cdrom: some swap cd tuning

[pcsx_rearmed.git] / libpcsxcore / cdrom.c

diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index 3e95742..bcf83e7 100644 (file)
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -298,13 +298,14 @@ static void Check_Shell( int Irq )
                                {
                                        // Vib Ribbon: pre-CD swap
                                        StopCdda();
+                                       StopReading();
 
 
                                        // GameShark Lite: Death if DiskError happens
                                        //
                                        // Vib Ribbon: Needs DiskError for CD swap
 
-                                       if (Irq != CdlNop)
+                                       //if (Irq != CdlNop)
                                        {
                                                cdr.Stat = DiskError;
 
@@ -852,11 +853,6 @@ void cdrInterrupt() {
                        break;
 
                case CdlGetTN:
-                       // 5-Star Racing: don't stop CDDA
-                       //
-                       // Vib Ribbon: CD swap
-                       StopReading();
-
                        cdr.CmdProcess = 0;
                        SetResultSize(3);
                        cdr.StatP |= STATUS_ROTATING;