X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmenu.c;h=199020d288fc446374725531cbf282f9126633bb;hp=3a6ae9c5d5bd7483465a841331687be3f928660d;hb=a9579f3bc3d60571252172b17195bca246d1a1be;hpb=9a11a883128d9df1fb3e6cce8bde69834c766266

diff --git a/frontend/menu.c b/frontend/menu.c
index 3a6ae9c5..199020d2 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -26,6 +26,7 @@
 #include "plugin_lib.h"
 #include "plat.h"
 #include "pcnt.h"
+#include "cspace.h"
 #include "libpicofe/plat.h"
 #include "libpicofe/input.h"
 #include "libpicofe/linux/in_evdev.h"
@@ -36,7 +37,6 @@
 #include "../libpcsxcore/cheat.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
 #include "../plugins/dfinput/externals.h"
-#include "../plugins/gpulib/cspace.h"
 #include "psemu_plugin_defs.h"
 #include "revision.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);
@@ -1698,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);
@@ -1830,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)
 {
@@ -2079,12 +2080,12 @@ static int swap_cd_multidisk(void)
 
 static void load_pcsx_cht(void)
 {
-	const char *exts[] = { "cht", NULL };
+	static const char *exts[] = { "cht", NULL };
 	const char *fname;
-	char path[256];
+	char msg[64];
 
-	path[0] = 0;
-	fname = menu_loop_romsel(path, sizeof(path), exts, NULL);
+	fname = menu_loop_romsel(last_selected_fname,
+			sizeof(last_selected_fname), exts, NULL);
 	if (fname == NULL)
 		return;
 
@@ -2094,8 +2095,8 @@ static void load_pcsx_cht(void)
 	if (NumCheats == 0 && NumCodes == 0)
 		menu_update_msg("failed to load cheats");
 	else {
-		snprintf(path, sizeof(path), "%d cheat(s) loaded", NumCheats + NumCodes);
-		menu_update_msg(path);
+		snprintf(msg, sizeof(msg), "%d cheat(s) loaded", NumCheats + NumCodes);
+		menu_update_msg(msg);
 	}
 	me_enable(e_menu_main, MA_MAIN_CHEATS, ready_to_go && NumCheats);
 }
@@ -2151,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;
@@ -2238,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))