X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fmenu.c;h=b25e1927c2aab322d1e5ad5424cb06daa8bddfc7;hb=418caf437ed1af2880b013462b603e1ca1f28fb5;hp=8119505139d9a98d4d7481346716c7dc6d210c0b;hpb=6f18d16a0abcbc0655ed82fd30796fa06242c2b8;p=pcsx_rearmed.git diff --git a/frontend/menu.c b/frontend/menu.c index 81195051..b25e1927 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))