X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fcdrom.c;h=3bf3e033b7fb15a8e45212aad0b13d4f7611b893;hp=297c8aee48f8fc07cc3c43f5c454ae2b52df836b;hb=0e2e3f498456d1175916ecd69d0a9e80e701e760;hpb=2daaaae3b2bb131d88ad750d8a74c146f04da62a

diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index 297c8aee..3bf3e033 100644
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -541,6 +541,9 @@ static void cdrPlayInterrupt_Autopause()
 	struct SubQ *subq = (struct SubQ *)CDR_getBufferSub();
 	int track_changed = 0;
 	if (subq != NULL ) {
+		// update subq
+		ReadTrack( cdr.SetSectorPlay );
+
 #ifdef CDR_LOG
 		CDR_LOG( "CDDA SUB - %X:%X:%X\n",
 			subq->AbsoluteAddress[0], subq->AbsoluteAddress[1], subq->AbsoluteAddress[2] );
@@ -553,7 +556,7 @@ static void cdrPlayInterrupt_Autopause()
 		Tomb Raider 1 ($7)
 		*/
 
-		if( cdr.CurTrack < btoi( subq->TrackNumber ) )
+		if( cdr.CurTrack + 1 == btoi( subq->TrackNumber ) )
 			track_changed = 1;
 	} else {
 		Create_Fake_Subq();
@@ -958,6 +961,9 @@ void cdrInterrupt() {
 			subq = (struct SubQ *)CDR_getBufferSub();
 
 			if (subq != NULL) {
+				// update subq
+				ReadTrack( cdr.SetSectorPlay );
+
 				cdr.Result[0] = subq->TrackNumber;
 				cdr.Result[1] = subq->IndexNumber;
 				memcpy(cdr.Result + 2, subq->TrackRelativeAddress, 3);