diff --git a/input/gx_input.c b/input/gx_input.c index a415fd2d8f..7b07777838 100644 --- a/input/gx_input.c +++ b/input/gx_input.c @@ -94,8 +94,7 @@ static void gx_input_poll(void *data) static bool gx_input_key_pressed(void *data, int key) { - return (g_extern.lifecycle_state & (1ULL << key)) || - input_joypad_pressed(&gx_joypad, 0, g_settings.input.binds[0], key); + return input_joypad_pressed(&gx_joypad, 0, g_settings.input.binds[0], key); } static uint64_t gx_input_get_capabilities(void *data) diff --git a/input/gx_input_joypad.c b/input/gx_input_joypad.c index d005d1bb3a..bb1bae1789 100644 --- a/input/gx_input_joypad.c +++ b/input/gx_input_joypad.c @@ -510,9 +510,6 @@ static void gx_joypad_poll(void) } uint64_t *state_p1 = &pad_state[0]; - uint64_t *lifecycle_state = &g_extern.lifecycle_state; - - *lifecycle_state &= ~((1ULL << RARCH_MENU_TOGGLE)); if (g_menu) { @@ -525,7 +522,7 @@ static void gx_joypad_poll(void) | (1ULL << GX_CLASSIC_HOME) #endif )) - *lifecycle_state |= (1ULL << RARCH_MENU_TOGGLE); + g_extern.lifecycle_state |= (1ULL << RARCH_MENU_TOGGLE); } static bool gx_joypad_query_pad(unsigned pad)