X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fcommon%2Femu.c;h=1bbdf35f72a3432b41539a14c1bebe2a5e6553e0;hb=b923ecbe75225bc7a1b6fbf419fd962a59066d59;hp=feb316764cada845b09f12ddd9107d704ffaf181;hpb=583ab72c0b42549235191fd4fad239074dd896af;p=picodrive.git

diff --git a/platform/common/emu.c b/platform/common/emu.c
index feb3167..1bbdf35 100644
--- a/platform/common/emu.c
+++ b/platform/common/emu.c
@@ -164,6 +164,9 @@ int emu_cdCheck(int *pregion)
 	unsigned char buf[32];
 	pm_file *cd_f;
 	int type = 0, region = 4; // 1: Japan, 4: US, 8: Europe
+	char ext[5];
+
+	get_ext(romFileName, ext);
 
 	cd_f = pm_open(romFileName);
 	if (!cd_f) return 0; // let the upper level handle this
@@ -330,7 +333,7 @@ int emu_ReloadRom(void)
 
 	// check for MegaCD image
 	cd_state = emu_cdCheck(&cd_region);
-	if (cd_state > 0)
+	if (cd_state != CIT_NOT_CD)
 	{
 		PicoAHW |= PAHW_MCD;
 		// valid CD image, check for BIOS..
@@ -405,8 +408,8 @@ int emu_ReloadRom(void)
 	Pico.m.frame_count = 0;
 
 	// insert CD if it was detected
-	if (cd_state > 0) {
-		ret = Insert_CD(romFileName, cd_state == 2);
+	if (cd_state != CIT_NOT_CD) {
+		ret = Insert_CD(romFileName, cd_state);
 		if (ret != 0) {
 			sprintf(menuErrorMsg, "Insert_CD() failed, invalid CD image?");
 			lprintf("%s\n", menuErrorMsg);