diff options
author | twinaphex | 2013-02-09 10:05:21 +0100 |
---|---|---|
committer | twinaphex | 2013-02-09 10:05:21 +0100 |
commit | ad72cb33d8ef068b92a059a774dd7871d052a707 (patch) | |
tree | f8623af5beeb8939631acceb2acb505c9497f71c /frontend/menu.c | |
parent | 2dfdc938c99783e187f60c1d13db73e0ee434c92 (diff) | |
parent | d57557c0644f9294e30657f0c7cf673cf2914695 (diff) | |
download | pcsx_rearmed-ad72cb33d8ef068b92a059a774dd7871d052a707.tar.gz pcsx_rearmed-ad72cb33d8ef068b92a059a774dd7871d052a707.tar.bz2 pcsx_rearmed-ad72cb33d8ef068b92a059a774dd7871d052a707.zip |
Merge git://github.com/notaz/pcsx_rearmed
Diffstat (limited to 'frontend/menu.c')
-rw-r--r-- | frontend/menu.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/frontend/menu.c b/frontend/menu.c index 8119505..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" @@ -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)) |