X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fcdrom.c;h=bcf83e71f8baa272047acbc1ec0233597df02f66;hb=6320e9bf2cb2e02dabae682385d5fa9410114c9d;hp=3e95742deb071c63ebb9ae8d2032923fff620fb8;hpb=d8432250e1574fb95bd8aab5b7a0231d0c3c3ded;p=pcsx_rearmed.git

diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index 3e95742d..bcf83e71 100644
--- 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;