aboutsummaryrefslogtreecommitdiff
path: root/libpcsxcore
diff options
context:
space:
mode:
authornotaz2012-11-04 02:29:54 +0200
committernotaz2012-11-04 02:29:54 +0200
commit0e2e3f498456d1175916ecd69d0a9e80e701e760 (patch)
tree793255771e567991e689bfaebc3e54f214569972 /libpcsxcore
parent2058d51fae1cfade8677c93079574f22507f589d (diff)
downloadpcsx_rearmed-0e2e3f498456d1175916ecd69d0a9e80e701e760.tar.gz
pcsx_rearmed-0e2e3f498456d1175916ecd69d0a9e80e701e760.tar.bz2
pcsx_rearmed-0e2e3f498456d1175916ecd69d0a9e80e701e760.zip
handle bad cd images better
Diffstat (limited to 'libpcsxcore')
-rw-r--r--libpcsxcore/cdrom.c2
-rw-r--r--libpcsxcore/misc.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index afacad2..3bf3e03 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 2fe5600..aee6e3c 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