X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=platform%2Fcommon%2Femu.c;h=140c017d4edf6aca0bf99966875a9cd5551ad7d0;hb=fa8fb7544593a0ed43f3354cc5f41150464b55bf;hp=c403dfa3cc18ab7b11150fb34d5c4d0d6334f94e;hpb=92dfd9afa6e06a071c2e025ff7e0d4f1824a5e8d;p=picodrive.git

diff --git a/platform/common/emu.c b/platform/common/emu.c
index c403dfa..140c017 100644
--- a/platform/common/emu.c
+++ b/platform/common/emu.c
@@ -322,6 +322,10 @@ static void system_announce(void)
 #endif
 	} else if (PicoAHW & PAHW_PICO) {
 		sys_name = "Pico";
+	} else if ((PicoAHW & (PAHW_32X|PAHW_MCD)) == (PAHW_32X|PAHW_MCD)) {
+		sys_name = "32X + Mega CD";
+		if ((Pico.m.hardware & 0xc0) == 0x80)
+			sys_name = "32X + Sega CD";
 	} else if (PicoAHW & PAHW_MCD) {
 		sys_name = "Mega CD";
 		if ((Pico.m.hardware & 0xc0) == 0x80)
@@ -348,6 +352,8 @@ static void do_region_override(const char *media_fname)
 
 int emu_reload_rom(const char *rom_fname_in)
 {
+	// use setting before rom config is loaded
+	int autoload = g_autostateld_opt;
 	char *rom_fname = NULL;
 	char ext[5];
 	enum media_type_e media_type;
@@ -491,7 +497,7 @@ int emu_reload_rom(const char *rom_fname_in)
 		emu_save_load_game(1, 1);
 
 	// state autoload?
-	if (g_autostateld_opt) {
+	if (autoload) {
 		int time, newest = 0, newest_slot = -1;
 		int slot;