X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Fmenu.c;h=18c4a3fb75ba08fe227d8dd8034e86d3a07d394d;hb=0f4090a90a3d5337db985325f38c7de7ca757847;hp=e679f5e65ebb1f493d3b96f4c1d2adb9d5c8dd9b;hpb=fea1749d54845b0c8305d8210369ed45c7eb3e5d;p=libpicofe.git

diff --git a/common/menu.c b/common/menu.c
index e679f5e..18c4a3f 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -1685,8 +1685,8 @@ static menu_entry e_menu_options[] =
 	mee_cust      ("Confirm savestate",        MA_OPT_CONFIRM_STATES,mh_opt_misc, mgn_opt_c_saves),
 	mee_range     (cpu_clk_name,               MA_OPT_CPU_CLOCKS,    currentConfig.CPUclock, 20, 900),
 	mee_handler   ("[Display options]",        menu_loop_gfx_options),
-	mee_handler   ("[Advanced options]",       menu_loop_adv_options),
 	mee_handler   ("[Sega/Mega CD options]",   menu_loop_cd_options),
+	mee_handler   ("[Advanced options]",       menu_loop_adv_options),
 	mee_handler_mkname_id(MA_OPT_SAVECFG, mh_saveloadcfg, mgn_savecfg),
 	mee_handler_id("Save cfg for current game only", MA_OPT_SAVECFG_GAME, mh_saveloadcfg),
 	mee_handler_mkname_id(MA_OPT_LOADCFG, mh_saveloadcfg, mgn_loadcfg),
@@ -1968,24 +1968,14 @@ void menu_loop(void)
 
 static int mh_tray_load_cd(menu_id id, int keys)
 {
-	cd_img_type cd_type;
 	char *ret_name;
-	int ret = -1;
 
 	ret_name = romsel_run();
 	if (ret_name == NULL)
 		return 0;
 
-	cd_type = emu_cd_check(NULL, ret_name);
-	if (cd_type != CIT_NOT_CD)
-		ret = Insert_CD(ret_name, cd_type);
-	if (ret != 0) {
-		me_update_msg("Load failed, invalid CD image?");
-		return 0;
-	}
-
 	engineState = PGS_RestartRun;
-	return 1;
+	return emu_swap_cd(ret_name);
 }
 
 static int mh_tray_nothing(menu_id id, int keys)
@@ -1995,12 +1985,12 @@ static int mh_tray_nothing(menu_id id, int keys)
 
 static menu_entry e_menu_tray[] =
 {
-	mee_label  ("The unit is about to"),
-	mee_label  ("close the CD tray."),
+	mee_label  ("The CD tray has opened."),
 	mee_label  (""),
 	mee_label  (""),
 	mee_handler("Load CD image",  mh_tray_load_cd),
 	mee_handler("Insert nothing", mh_tray_nothing),
+	mee_end,
 };
 
 int menu_loop_tray(void)
@@ -2043,6 +2033,8 @@ void menu_plat_setup(int is_wiz)
 
 	if (!is_wiz) {
 		me_enable(e_menu_gfx_options, MA_OPT_TEARING_FIX, 0);
+		i = me_id2offset(e_menu_gfx_options, MA_OPT_TEARING_FIX);
+		e_menu_gfx_options[i].need_to_save = 0;
 		return;
 	}
 
@@ -2052,6 +2044,8 @@ void menu_plat_setup(int is_wiz)
 
 	i = me_id2offset(e_menu_gfx_options, MA_OPT_SCALING);
 	e_menu_gfx_options[i].max = 1;	/* only off and sw */
+	i = me_id2offset(e_menu_gfx_options, MA_OPT_ARM940_SOUND);
+	e_menu_gfx_options[i].need_to_save = 0;
 }
 
 /* TODO: rename */