From 05f19a3e278c89176a6ab8e39adab66e4e577362 Mon Sep 17 00:00:00 2001 From: notaz Date: Sun, 6 Aug 2023 19:22:42 +0300 Subject: [PATCH] cdriso: clean up mode1 detection libretro/pcsx_rearmed#743 --- libpcsxcore/cdriso.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c index eeb2c351..081a8f2b 100644 --- a/libpcsxcore/cdriso.c +++ b/libpcsxcore/cdriso.c @@ -1326,7 +1326,6 @@ static long CALLBACK ISOopen(void) { char alt_bin_filename[MAXPATHLEN]; const char *bin_filename; char image_str[1024]; - int is_chd = 0; if (cdHandle != NULL) { return 0; // it's already open @@ -1381,7 +1380,6 @@ static long CALLBACK ISOopen(void) { CDR_getBuffer = ISOgetBuffer_chd; cdimg_read_func = cdread_chd; cdimg_read_sub_func = cdread_sub_chd; - is_chd = 1; } #endif @@ -1422,14 +1420,11 @@ static long CALLBACK ISOopen(void) { } // guess whether it is mode1/2048 - if (ftello(cdHandle) % 2048 == 0) { + if (cdimg_read_func == cdread_normal && ftello(cdHandle) % 2048 == 0) { unsigned int modeTest = 0; fseek(cdHandle, 0, SEEK_SET); if (!fread(&modeTest, sizeof(modeTest), 1, cdHandle)) { -#ifndef NDEBUG SysPrintf(_("File IO error in <%s:%s>.\n"), __FILE__, __func__); -#endif - return -1; } if (SWAP32(modeTest) != 0xffffff00) { strcat(image_str, "[2048]"); @@ -1442,7 +1437,7 @@ static long CALLBACK ISOopen(void) { PrintTracks(); - if (subChanMixed && !is_chd) { + if (subChanMixed && cdimg_read_func == cdread_normal) { cdimg_read_func = cdread_sub_mixed; cdimg_read_sub_func = cdread_sub_sub_mixed; } -- 2.39.5