From 69e482e3def6669a4fa921d07f9ba04883d7de34 Mon Sep 17 00:00:00 2001
From: notaz
Date: Wed, 30 Jan 2013 03:55:15 +0200
Subject: frontend: change how exit is done

will no longer be done from recompiler callback that could cause
still used data to be freed
---
 frontend/menu.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'frontend/menu.c')

diff --git a/frontend/menu.c b/frontend/menu.c
index 8119505..b25e192 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -1832,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)
 {
@@ -2153,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;
@@ -2240,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))
-- 
cgit v1.2.3


From c82f907a99f7d0d3071471489d247f4b4394a8b7 Mon Sep 17 00:00:00 2001
From: notaz
Date: Fri, 8 Feb 2013 02:05:48 +0200
Subject: move cspace back to frontend

plugins no longer depend on it
---
 frontend/menu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'frontend/menu.c')

diff --git a/frontend/menu.c b/frontend/menu.c
index b25e192..46e4298 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"
 
-- 
cgit v1.2.3