From 6fcf291df4a2a576ecb38e6431374cfba68add24 Mon Sep 17 00:00:00 2001 From: sonninnos Date: Thu, 24 Mar 2022 14:24:24 +0200 Subject: [PATCH] Fix analog stick not working with 'Unified Menu Controls' --- input/input_driver.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/input/input_driver.c b/input/input_driver.c index 0604828d9b..1632786a28 100644 --- a/input/input_driver.c +++ b/input/input_driver.c @@ -5328,7 +5328,8 @@ void input_driver_collect_system_input(input_driver_state_t *input_st, #endif #ifdef HAVE_MENU bool display_kb = menu_input_dialog_get_display_kb(); - bool menu_input_active = menu_state_get_ptr()->alive && + bool menu_is_alive = menu_state_get_ptr()->alive; + bool menu_input_active = menu_is_alive && !(settings->bools.menu_unified_controls && !display_kb); #endif input_driver_t *current_input = input_st->current_driver; @@ -5358,7 +5359,7 @@ void input_driver_collect_system_input(input_driver_state_t *input_st, } #ifdef HAVE_MENU - if (menu_input_active) + if (menu_is_alive) { unsigned k; unsigned x_plus = RARCH_ANALOG_LEFT_X_PLUS; @@ -5407,7 +5408,7 @@ void input_driver_collect_system_input(input_driver_state_t *input_st, &joypad_info); #ifdef HAVE_MENU - if (menu_input_active) + if (menu_is_alive) { unsigned j;