X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Femu.c;h=2e813d3d5e6b5340328fc41124f43c02c4f82897;hb=0f4090a90a3d5337db985325f38c7de7ca757847;hp=118dc38314b923114606186f4668d9ae69b766ee;hpb=f71361b521c9c64351ea99ed97627a606c642008;p=libpicofe.git

diff --git a/common/emu.c b/common/emu.c
index 118dc38..2e813d3 100644
--- a/common/emu.c
+++ b/common/emu.c
@@ -407,8 +407,8 @@ int emu_reload_rom(char *rom_fname)
 		// valid CD image, check for BIOS..
 
 		// we need to have config loaded at this point
-		ret = emu_read_config(1, 1);
-		if (!ret) emu_read_config(0, 1);
+		ret = emu_read_config(1, 0);
+		if (!ret) emu_read_config(0, 0);
 		cfg_loaded = 1;
 
 		if (PicoRegionOverride) {
@@ -465,8 +465,8 @@ int emu_reload_rom(char *rom_fname)
 	if (!(PicoAHW & PAHW_MCD))
 		memcpy(id_header, rom_data + 0x100, sizeof(id_header));
 	if (!cfg_loaded) {
-		ret = emu_read_config(1, 1);
-		if (!ret) emu_read_config(0, 1);
+		ret = emu_read_config(1, 0);
+		if (!ret) emu_read_config(0, 0);
 	}
 
 	lprintf("PicoCartInsert(%p, %d);\n", rom_data, rom_size);
@@ -613,10 +613,11 @@ int emu_read_config(int game, int no_defaults)
 	char cfg[512];
 	int ret;
 
+	if (!no_defaults)
+		emu_set_defconfig();
+
 	if (!game)
 	{
-		if (!no_defaults)
-			emu_set_defconfig();
 		make_config_cfg(cfg);
 		ret = config_readsect(cfg, NULL);
 	}
@@ -796,7 +797,8 @@ char *emu_get_save_fname(int load, int is_sram, int slot)
 
 	if (is_sram)
 	{
-		romfname_ext(saveFname, (PicoAHW&1) ? "brm"PATH_SEP : "srm"PATH_SEP, (PicoAHW&1) ? ".brm" : ".srm");
+		romfname_ext(saveFname, (PicoAHW & PAHW_MCD) ? "brm"PATH_SEP : "srm"PATH_SEP,
+				(PicoAHW & PAHW_MCD) ? ".brm" : ".srm");
 		if (load) {
 			if (try_ropen_file(saveFname)) return saveFname;
 			// try in current dir..
@@ -988,9 +990,14 @@ void emu_set_fastforward(int set_on)
 	}
 }
 
-static void emu_msg_tray_open(void)
+static void emu_tray_open(void)
+{
+	engineState = PGS_TrayMenu;
+}
+
+static void emu_tray_close(void)
 {
-	emu_status_msg("CD tray opened");
+	emu_status_msg("CD tray closed.");
 }
 
 void emu_reset_game(void)
@@ -1212,8 +1219,8 @@ void emu_init(void)
 
 	PicoInit();
 	PicoMessage = plat_status_msg_busy_next;
-	PicoMCDopenTray = emu_msg_tray_open;
-	PicoMCDcloseTray = menu_loop_tray;
+	PicoMCDopenTray = emu_tray_open;
+	PicoMCDcloseTray = emu_tray_close;
 }
 
 void emu_finish(void)