X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmenu.c;h=b25e1927c2aab322d1e5ad5424cb06daa8bddfc7;hp=7dab2e6897b65ce9e8c367e742e5a9498e40c848;hb=69e482e3def6669a4fa921d07f9ba04883d7de34;hpb=c0c64e603a2d6d220817ca538e1b5cacd8a8ad40

diff --git a/frontend/menu.c b/frontend/menu.c
index 7dab2e68..b25e1927 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -8,7 +8,7 @@
  * See the COPYING file in the top-level directory.
  */
 
-#define _GNU_SOURCE
+#define _GNU_SOURCE 1
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
@@ -251,7 +251,9 @@ static int optional_cdimg_filter(struct dirent **namelist, int count,
 				p = strrchr(buf2, '/');
 				if (p == NULL)
 					p = strrchr(buf2, '\\');
-				if (p == NULL)
+				if (p != NULL)
+					p++;
+				else
 					p = buf2;
 
 				snprintf(buf, sizeof(buf), "%s/%s", basedir, p);
@@ -327,6 +329,7 @@ static void menu_set_defconfig(void)
 
 	g_opts = 0;
 	g_scaler = SCALE_4_3;
+	g_gamma = 100;
 	volume_boost = 0;
 	frameskip = 0;
 	analog_deadzone = 50;
@@ -391,6 +394,7 @@ static const struct {
 	CE_CONFIG_VAL(Cpu),
 	CE_INTVAL(region),
 	CE_INTVAL_V(g_scaler, 2),
+	CE_INTVAL(g_gamma),
 	CE_INTVAL(g_layer_x),
 	CE_INTVAL(g_layer_y),
 	CE_INTVAL(g_layer_w),
@@ -1696,10 +1700,10 @@ out:
 
 static void handle_memcard_sel(void)
 {
-	Config.Mcd1[0] = 0;
+	strcpy(Config.Mcd1, "none");
 	if (memcard1_sel != 0)
 		snprintf(Config.Mcd1, sizeof(Config.Mcd1), ".%s%s", MEMCARD_DIR, memcards[memcard1_sel]);
-	Config.Mcd2[0] = 0;
+	strcpy(Config.Mcd2, "none");
 	if (memcard2_sel != 0)
 		snprintf(Config.Mcd2, sizeof(Config.Mcd2), ".%s%s", MEMCARD_DIR, memcards[memcard2_sel]);
 	LoadMcds(Config.Mcd1, Config.Mcd2);
@@ -1828,7 +1832,6 @@ static void menu_bios_warn(void)
 // ------------ main menu ------------
 
 static menu_entry e_menu_main[];
-void OnFile_Exit();
 
 static void draw_frame_main(void)
 {
@@ -2149,8 +2152,8 @@ static int main_menu_handler(int id, int keys)
 		in_menu_wait(PBTN_MOK|PBTN_MBACK, NULL, 70);
 		break;
 	case MA_MAIN_EXIT:
-		OnFile_Exit();
-		break;
+		emu_core_ask_exit();
+		return 1;
 	default:
 		lprintf("%s: something unknown selected\n", __FUNCTION__);
 		break;
@@ -2236,7 +2239,7 @@ void menu_loop(void)
 
 	do {
 		me_loop_d(e_menu_main, &sel, NULL, draw_frame_main);
-	} while (!ready_to_go);
+	} while (!ready_to_go && !g_emu_want_quit);
 
 	/* wait until menu, ok, back is released */
 	while (in_menu_wait_any(NULL, 50) & (PBTN_MENU|PBTN_MOK|PBTN_MBACK))