From: notaz <notasas@gmail.com>
Date: Sun, 6 Aug 2023 16:22:42 +0000 (+0300)
Subject: cdriso: clean up mode1 detection
X-Git-Tag: r24l~260
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e49a25d527a1d79569f39a6f2d8d28a0d6cebd5;p=pcsx_rearmed.git

cdriso: clean up mode1 detection

libretro/pcsx_rearmed#743
---

diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c
index 8e11f5a6..1233ba3f 100644
--- a/libpcsxcore/cdriso.c
+++ b/libpcsxcore/cdriso.c
@@ -1585,7 +1585,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
@@ -1640,7 +1639,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
 
@@ -1681,14 +1679,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]");
@@ -1701,7 +1696,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;
 	}