From b647f6e01929ecc0f77c46cb29807480c783e1f9 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 7 May 2018 02:44:03 +0200
Subject: [PATCH] Cleanups

---
 menu/menu_displaylist.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 025e1fafd2..3962227c00 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -2537,14 +2537,11 @@ static int menu_displaylist_parse_horizontal_list(
 }
 
 static int menu_displaylist_parse_load_content_settings(
+      menu_handle_t *menu,
       menu_displaylist_info_t *info)
 {
-   menu_handle_t *menu    = NULL;
    settings_t *settings   = config_get_ptr();
 
-   if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu))
-      return -1;
-
    if (!rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL))
    {
 #ifdef HAVE_LAKKA
@@ -2783,7 +2780,7 @@ static int menu_displaylist_parse_horizontal_content_actions(
          && string_is_equal(menu->deferred_path, fullpath);
 
    if (content_loaded)
-      menu_displaylist_parse_load_content_settings(info);
+      menu_displaylist_parse_load_content_settings(menu, info);
    else
    {
       const char *ext = NULL;
@@ -6351,7 +6348,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
          break;
       case DISPLAYLIST_CONTENT_SETTINGS:
          menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
-         ret = menu_displaylist_parse_load_content_settings(info);
+         ret = menu_displaylist_parse_load_content_settings(menu, info);
 
          info->need_refresh = true;
          info->need_push    = true;
@@ -6365,7 +6362,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
          break;
       case DISPLAYLIST_ADD_CONTENT_LIST:
          menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
-         ret = menu_displaylist_parse_add_content_list(info);
+         count = menu_displaylist_parse_add_content_list(info);
 
          if (count == 0)
             menu_entries_append_enum(info->list,
@@ -6387,7 +6384,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
          break;
       case DISPLAYLIST_SCAN_DIRECTORY_LIST:
          menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
-         ret = menu_displaylist_parse_scan_directory_list(info);
+         count = menu_displaylist_parse_scan_directory_list(info);
 
          if (count == 0)
             menu_entries_append_enum(info->list,
@@ -6396,6 +6393,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
                   MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY,
                   FILE_TYPE_NONE, 0, 0);
 
+         ret                = 0;
          info->need_push    = true;
          info->need_refresh = true;
          break;