Backport/rewrites wmarquesr pt. 7.5

AkimanBengus · Dec 4, 2015 · fdfcbaa · fdfcbaa
1 parent b280d25
commit fdfcbaa
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/menu/menu_input.c b/menu/menu_input.c
@@ -1031,18 +1031,20 @@ 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;
    if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection))
       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])