From 7ebbafe8e11d7e4786ac973a0e8041f749b05840 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 10 Jan 2013 22:42:12 +0100 Subject: [PATCH] (RARCH_CONSOLE) Don't need rarch_settings_change anymore for exiting --- console/rarch_console_settings.c | 7 ------- console/rarch_console_settings.h | 2 -- frontend/menu/rgui.c | 8 ++++++-- frontend/menu/rmenu.c | 8 ++++++-- frontend/menu/rmenu_xui.cpp | 8 ++++++-- frontend/platform/platform_ps3.c | 3 ++- 6 files changed, 20 insertions(+), 16 deletions(-) diff --git a/console/rarch_console_settings.c b/console/rarch_console_settings.c index 548dafaae7..c4ffe56626 100644 --- a/console/rarch_console_settings.c +++ b/console/rarch_console_settings.c @@ -86,13 +86,6 @@ void rarch_settings_change(unsigned setting) g_extern.console.screen.resolutions.current.id = g_extern.console.screen.resolutions.list[g_extern.console.screen.resolutions.current.idx]; } break; - case S_QUIT: - g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_INGAME); - g_extern.lifecycle_menu_state = (1 << MODE_EXIT); - break; - case S_QUIT_RARCH: - g_extern.lifecycle_menu_state = (1 << MODE_EXIT); - break; case S_RETURN_TO_GAME: g_extern.lifecycle_menu_state = (1 << MODE_EMULATION); break; diff --git a/console/rarch_console_settings.h b/console/rarch_console_settings.h index 684d758d32..bf2c4db459 100644 --- a/console/rarch_console_settings.h +++ b/console/rarch_console_settings.h @@ -39,10 +39,8 @@ enum S_HW_TEXTURE_FILTER_2, S_OVERSCAN_DECREMENT, S_OVERSCAN_INCREMENT, - S_QUIT, S_RESOLUTION_PREVIOUS, S_RESOLUTION_NEXT, - S_QUIT_RARCH, S_RETURN_TO_GAME, S_RETURN_TO_LAUNCHER, S_RETURN_TO_MENU, diff --git a/frontend/menu/rgui.c b/frontend/menu/rgui.c index febc73e4a6..7778adc6cc 100644 --- a/frontend/menu/rgui.c +++ b/frontend/menu/rgui.c @@ -238,7 +238,8 @@ rgui_handle_t *rgui_init(const char *base_path, else { RARCH_ERR("no font bmp or bin, abort"); - rarch_settings_change(S_QUIT); + g_extern.lifecycle_menu_state &= ~((1 << MODE_MENU) | (1 << MODE_MENU_INGAME) | (1 << MODE_EMULATION)); + g_extern.lifecycle_menu_state |= (1 << MODE_EXIT); } return rgui; @@ -764,7 +765,10 @@ static void rgui_settings_toggle_setting(rgui_file_type_t setting, rgui_action_t break; case RGUI_SETTINGS_QUIT_EMULATOR: if (action == RGUI_ACTION_OK) - rarch_settings_change(S_QUIT); + { + g_extern.lifecycle_menu_state &= ~((1 << MODE_MENU) | (1 << MODE_MENU_INGAME) | (1 << MODE_EMULATION)); + g_extern.lifecycle_menu_state |= (1 << MODE_EXIT); + } break; // controllers case RGUI_SETTINGS_BIND_DEVICE: diff --git a/frontend/menu/rmenu.c b/frontend/menu/rmenu.c index 4fb0ef198f..8b5508464e 100644 --- a/frontend/menu/rmenu.c +++ b/frontend/menu/rmenu.c @@ -1415,7 +1415,8 @@ static void set_setting_action(void *data, unsigned switchvalue, uint64_t input) case SETTING_QUIT_RARCH: if((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B)) || (input & (1ULL << RMENU_DEVICE_NAV_B))) { - rarch_settings_change(S_QUIT_RARCH); + g_extern.lifecycle_menu_state &= ~((1 << MODE_MENU) | (1 << MODE_MENU_INGAME) | (1 << MODE_EMULATION)); + g_extern.lifecycle_menu_state |= (1 << MODE_EXIT); } break; case SETTING_EMU_AUDIO_MUTE: @@ -2202,7 +2203,10 @@ int ingame_menu(void *data, void *state) #endif case MENU_ITEM_QUIT_RARCH: if(input & (1ULL << RMENU_DEVICE_NAV_B)) - rarch_settings_change(S_QUIT_RARCH); + { + g_extern.lifecycle_menu_state &= ~((1 << MODE_MENU) | (1 << MODE_MENU_INGAME) | (1 << MODE_EMULATION)); + g_extern.lifecycle_menu_state |= (1 << MODE_EXIT); + } snprintf(strw_buffer, sizeof(strw_buffer), "Press [%s] to quit RetroArch.", rarch_input_find_platform_key_label(1ULL << RETRO_DEVICE_ID_JOYPAD_B)); break; diff --git a/frontend/menu/rmenu_xui.cpp b/frontend/menu/rmenu_xui.cpp index e5b8f8ecbd..17be361108 100644 --- a/frontend/menu/rmenu_xui.cpp +++ b/frontend/menu/rmenu_xui.cpp @@ -836,7 +836,8 @@ HRESULT CRetroArchQuickMenu::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled rarch_settings_change(S_RETURN_TO_GAME); break; case MENU_ITEM_QUIT_RARCH: - rarch_settings_change(S_QUIT_RARCH); + g_extern.lifecycle_menu_state &= ~((1 << MODE_MENU) | (1 << MODE_MENU_INGAME) | (1 << MODE_EMULATION)); + g_extern.lifecycle_menu_state |= (1 << MODE_EXIT); break; } } @@ -1045,7 +1046,10 @@ HRESULT CRetroArchMain::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled ) NavigateForward(app.hRetroArchSettings); } else if ( hObjPressed == m_quit ) - rarch_settings_change(S_QUIT_RARCH); + { + g_extern.lifecycle_menu_state &= ~((1 << MODE_MENU) | (1 << MODE_MENU_INGAME) | (1 << MODE_EMULATION)); + g_extern.lifecycle_menu_state |= (1 << MODE_EXIT); + } bHandled = TRUE; return 0; diff --git a/frontend/platform/platform_ps3.c b/frontend/platform/platform_ps3.c index 3c4184b7a4..3255a02186 100644 --- a/frontend/platform/platform_ps3.c +++ b/frontend/platform/platform_ps3.c @@ -156,7 +156,8 @@ static void callback_sysutil_exit(uint64_t status, uint64_t param, void *userdat { case CELL_SYSUTIL_REQUEST_EXITGAME: gl->quitting = true; - rarch_settings_change(S_QUIT); + g_extern.lifecycle_menu_state &= ~((1 << MODE_MENU) | (1 << MODE_MENU_INGAME) | (1 << MODE_EMULATION)); + g_extern.lifecycle_menu_state |= (1 << MODE_EXIT); break; #ifdef HAVE_OSKUTIL case CELL_SYSUTIL_OSKDIALOG_FINISHED: