notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
frontend: change how exit is done
[pcsx_rearmed.git]
/
frontend
/
menu.c
diff --git
a/frontend/menu.c
b/frontend/menu.c
index
8119505
..
b25e192
100644
(file)
--- 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[];
// ------------ main menu ------------
static menu_entry e_menu_main[];
-void OnFile_Exit();
static void draw_frame_main(void)
{
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:
in_menu_wait(PBTN_MOK|PBTN_MBACK, NULL, 70);
break;
case MA_MAIN_EXIT:
-
OnFile_E
xit();
-
break
;
+
emu_core_ask_e
xit();
+
return 1
;
default:
lprintf("%s: something unknown selected\n", __FUNCTION__);
break;
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);
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))
/* wait until menu, ok, back is released */
while (in_menu_wait_any(NULL, 50) & (PBTN_MENU|PBTN_MOK|PBTN_MBACK))