diff --git a/frontend/menu/rmenu_xui.cpp b/frontend/menu/rmenu_xui.cpp index 5269cb1f75..b3537f709e 100644 --- a/frontend/menu/rmenu_xui.cpp +++ b/frontend/menu/rmenu_xui.cpp @@ -1750,17 +1750,16 @@ bool menu_iterate(void) process_input_ret = -1; } - if (!(g_extern.frame_count < g_extern.delay_timer[0])) - { - bool rmenu_enable = ((state.Gamepad.wButtons & XINPUT_GAMEPAD_LEFT_THUMB) - && (state.Gamepad.wButtons & XINPUT_GAMEPAD_RIGHT_THUMB) && (g_extern.main_is_init)); + bool rmenu_enable = ((state.Gamepad.wButtons & XINPUT_GAMEPAD_LEFT_THUMB) + && (state.Gamepad.wButtons & XINPUT_GAMEPAD_RIGHT_THUMB) && (g_extern.main_is_init)); - if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU)) - if (rmenu_enable) - { - g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME); - process_input_ret = -1; - } + if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU)) + { + if (rmenu_enable) + { + g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME); + process_input_ret = -1; + } } switch(input_loop) diff --git a/general.h b/general.h index ac989294a9..430b0eb308 100644 --- a/general.h +++ b/general.h @@ -524,8 +524,6 @@ struct global } frame_cache; unsigned frame_count; - // two timers, the first for handling menu and exit button delays, the second for scrolling delays - unsigned delay_timer[2]; char title_buf[64]; struct diff --git a/gx/gx_input.c b/gx/gx_input.c index 82c4f28039..b05d25c455 100644 --- a/gx/gx_input.c +++ b/gx/gx_input.c @@ -730,15 +730,12 @@ static void gx_input_poll(void *data) g_menu = false; } - if (!(g_extern.frame_count < g_extern.delay_timer[0])) - { - if (*state_p1 & (GX_WIIMOTE_HOME + if (*state_p1 & (GX_WIIMOTE_HOME #ifdef HW_RVL - | GX_CLASSIC_HOME + | GX_CLASSIC_HOME #endif - )) - *lifecycle_state |= (1ULL << RARCH_MENU_TOGGLE); - } + )) + *lifecycle_state |= (1ULL << RARCH_MENU_TOGGLE); } static bool gx_input_key_pressed(void *data, int key)