From: notaz <notasas@gmail.com>
Date: Sun, 4 Nov 2012 00:29:54 +0000 (+0200)
Subject: handle bad cd images better
X-Git-Tag: r16~11
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=commitdiff_plain;h=0e2e3f498456d1175916ecd69d0a9e80e701e760;hp=2058d51fae1cfade8677c93079574f22507f589d

handle bad cd images better
---

diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index afacad26..3bf3e033 100644
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -556,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();
diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c
index 2fe5600a..aee6e3ce 100644
--- a/libpcsxcore/misc.c
+++ b/libpcsxcore/misc.c
@@ -364,6 +364,9 @@ int CheckCdrom() {
 		}
 	}
 
+	if (CdromId[0] == '\0')
+		strcpy(CdromId, "SLUS99999");
+
 	if (Config.PsxAuto) { // autodetect system (pal or ntsc)
 		if (CdromId[2] == 'e' || CdromId[2] == 'E')
 			Config.PsxType = PSX_TYPE_PAL; // pal