From b280d25f8a80bca71217178cf57447484183b973 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 4 Dec 2015 11:06:33 +0100 Subject: [PATCH] Backport/rewrites wmarquesr pt. 8 --- 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 3510f4a84b..52e38a30fd 100644 --- a/menu/menu_input.c +++ b/menu/menu_input.c @@ -892,16 +892,18 @@ static int menu_input_mouse_post_iterate(uint64_t *input_mouse, unsigned header_height; settings_t *settings = config_get_ptr(); menu_input_t *menu_input = menu_input_get_ptr(); + bool check_overlay = settings ? !settings->menu.mouse.enable: false; *input_mouse = MOUSE_ACTION_NONE; menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection); - if (!settings->menu.mouse.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) { menu_input->mouse.wheeldown = false; menu_input->mouse.wheelup = false;