From 59b86027e9b96034c5d09de576ce912090a903e2 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 24 Feb 2017 06:26:20 +0100
Subject: [PATCH] Simplify menu_displaylist_parse_cores

---
 menu/cbs/menu_cbs_ok.c  | 6 ++++++
 menu/menu_displaylist.c | 5 ++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 016ec30127..9f35c96d6d 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -949,10 +949,16 @@ static int file_load_with_detect_core_wrapper(
    def_info.s          = menu->deferred_path;
    def_info.len        = sizeof(menu->deferred_path);
 
+   RARCH_LOG("menu_path_new: %s\n", menu_path_new);
+   RARCH_LOG("menu_label: %s\n", menu_label);
+   RARCH_LOG("path: %s\n",       path);
+
    if (menu_content_find_first_core(&def_info, false, new_core_path,
             sizeof(new_core_path)))
       ret = -1;
 
+   RARCH_LOG("new core path: %s\n",       new_core_path);
+
    if (     !is_carchive && !string_is_empty(path)
          && !string_is_empty(menu_path_new))
       fill_pathname_join(detect_content_path, menu_path_new, path,
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index bc960b1d62..f5c886044b 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -3386,8 +3386,7 @@ no_playlists:
 
 static int menu_displaylist_parse_cores(
       menu_handle_t       *menu,
-      menu_displaylist_info_t *info,
-      enum menu_displaylist_ctl_state type)
+      menu_displaylist_info_t *info)
 {
    size_t i, list_size;
    struct string_list *str_list = NULL;
@@ -6380,7 +6379,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
          }
          break;
       case DISPLAYLIST_CORES:
-         if (menu_displaylist_parse_cores(menu, info, type) == 0)
+         if (menu_displaylist_parse_cores(menu, info) == 0)
          {
             info->need_refresh = true;
             info->need_push    = true;