mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-26 09:35:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

(GX) Quit button combos work again

Browse Source
This commit is contained in:
twinaphex 2013-01-12 06:12:47 +01:00
parent ef4f1bba0d
commit 5f0344f002
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
frontend/menu/rmenu_gx.c
View File

@ -183,20 +183,12 @@ int rmenu_input_process(void *data, void *state)
if (!(g_extern.frame_count < g_extern.delay_timer[0]))
{
bool return_to_game_enable = ((trigger_state & (1ULL << GX_DEVICE_NAV_MENU)) && g_extern.main_is_init);
bool quit_key_pressed = (trigger_state & (1ULL << GX_DEVICE_NAV_QUIT));
if (return_to_game_enable)
{
g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION);
return -1;
}
if (quit_key_pressed)
{
g_extern.lifecycle_mode_state &= ~((1ULL << MODE_EMULATION));
g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT);
return -1;
}
}
return 0;
@ -269,6 +261,11 @@ bool rmenu_iterate(void)
action = RGUI_ACTION_START;
else if (trigger_state & (1ULL << GX_DEVICE_NAV_SELECT))
action = RGUI_ACTION_SETTINGS;
else if (trigger_state & (1ULL << GX_DEVICE_NAV_QUIT))
{
g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT);
goto deinit;
}
int input_entry_ret = 0;
int input_process_ret = 0;