cdrom: remove play pregap hack

[pcsx_rearmed.git] / libpcsxcore / cdrom.c

diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index 142c1e2..c667ac4 100644 (file)
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -709,11 +709,12 @@ void cdrInterrupt() {
                        Wild 9: skip PREGAP + starting accurate SubQ
                        - plays tracks without retry play
                        */
+                       /* unneeded with correct cdriso?
                        Set_Track();
+                       */
                        Find_CurTrack();
                        ReadTrack( cdr.SetSectorPlay );
 
-
                        // GameShark CD Player: Calls 2x + Play 2x
                        if( cdr.FastBackward || cdr.FastForward ) {
                                if( cdr.FastForward ) cdr.FastForward--;
@@ -1216,7 +1217,8 @@ void cdrInterrupt() {
                        // - fixes cutscene speech
                        {
                                u8 *buf = CDR_getBuffer();
-                               memcpy(cdr.Transfer, buf, 8);
+                               if (buf != NULL)
+                                       memcpy(cdr.Transfer, buf, 8);
                        }