X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fcdriso.c;h=081a8f2b96483e0d8d50e3d18034a00770abb222;hb=3b988ef27435350b7b944016f6387cb189051c45;hp=d0440e20ab949feb0fb6d174e3ad1849910fd450;hpb=f28d12a72998b0a6018b41af8f86a24b10ab506f;p=pcsx_rearmed.git diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c index d0440e20..081a8f2b 100644 --- a/libpcsxcore/cdriso.c +++ b/libpcsxcore/cdriso.c @@ -30,7 +30,7 @@ #include #include #define strcasecmp _stricmp -#elif HAVE_PTHREAD +#elif P_HAVE_PTHREAD #include #include #include @@ -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; }