handle bad cd images better

diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index afacad2..3bf3e03 100644 (file)
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -556,7 +556,7 @@ static void cdrPlayInterrupt_Autopause()
                Tomb Raider 1 ($7)
                */
 
                Tomb Raider 1 ($7)
                */
 

-               if( cdr.CurTrack < btoi( subq->TrackNumber ) )
+               if( cdr.CurTrack + 1 == btoi( subq->TrackNumber ) )

                        track_changed = 1;
        } else {
                Create_Fake_Subq();
                        track_changed = 1;
        } else {
                Create_Fake_Subq();

diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c
index 2fe5600..aee6e3c 100644 (file)
--- 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
        if (Config.PsxAuto) { // autodetect system (pal or ntsc)
                if (CdromId[2] == 'e' || CdromId[2] == 'E')
                        Config.PsxType = PSX_TYPE_PAL; // pal