From fdfcbaa04284cc2f4cf83420614f45454fd06083 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 4 Dec 2015 11:08:12 +0100 Subject: [PATCH] Backport/rewrites wmarquesr pt. 7.5 --- menu/menu_input.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/menu/menu_input.c b/menu/menu_input.c index 52e38a30fd..34b98a5abe 100644 --- a/menu/menu_input.c +++ b/menu/menu_input.c @@ -1031,6 +1031,7 @@ static int menu_input_pointer_post_iterate(menu_file_list_cbs_t *cbs, int ret = 0; menu_input_t *menu_input = menu_input_get_ptr(); settings_t *settings = config_get_ptr(); + bool check_overlay = settings ? !settings->menu.pointer.enable : false; if (!menu_input) return -1; @@ -1038,11 +1039,12 @@ static int menu_input_pointer_post_iterate(menu_file_list_cbs_t *cbs, return -1; menu_display_ctl(MENU_DISPLAY_CTL_HEADER_HEIGHT, &header_height); - if (!settings->menu.pointer.enable #ifdef HAVE_OVERLAY - || (settings->input.overlay_enable && input_overlay_is_alive()) + check_overlay = check_overlay || + (settings->input.overlay_enable && input_overlay_is_alive()); #endif - ) + + if (check_overlay) return 0; if (menu_input->pointer.pressed[0])