From 3834d29fcbb16c365e00691841bbb5e4fb5bfb43 Mon Sep 17 00:00:00 2001
From: M4xw <m4x@m4xw.net>
Date: Sun, 19 May 2019 23:51:07 +0200
Subject: [PATCH] Revert "Simplify menu_displaylist_parse_cores"

This reverts commit 269a95b0bff9e352be55c98e6b0825353c9659db.
---
 menu/menu_displaylist.c | 73 ++++++++++++++++++++++++-----------------
 1 file changed, 43 insertions(+), 30 deletions(-)

diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index de08d34a1c..8b21ae1d05 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -2327,14 +2327,11 @@ static unsigned menu_displaylist_parse_cores(
       menu_displaylist_info_t *info)
 {
    size_t i, list_size;
-   const char *dir              = NULL;
-   core_info_list_t *list       = NULL;
    struct string_list *str_list = NULL;
    unsigned items_found         = 0;
    settings_t *settings         = config_get_ptr();
    const char *path             = info->path;
-   bool ok                      = false;
-
+   bool ok;
 
    if (string_is_empty(path))
    {
@@ -2345,10 +2342,6 @@ static unsigned menu_displaylist_parse_cores(
       return items_found;
    }
 
-   core_info_get_list(&list);
-
-   menu_entries_get_last_stack(&dir, NULL, NULL, NULL, NULL);
-
    str_list = string_list_new();
    ok = dir_list_append(str_list, path, info->exts,
          true, settings->bools.show_hidden_files, false, false);
@@ -2418,8 +2411,8 @@ static unsigned menu_displaylist_parse_cores(
    {
       bool is_dir;
       char label[64];
-      enum msg_hash_enums enum_idx  = MSG_UNKNOWN;
       const char *path              = NULL;
+      enum msg_hash_enums enum_idx  = MSG_UNKNOWN;
       enum msg_file_type file_type  = FILE_TYPE_NONE;
 
       label[0] = '\0';
@@ -2473,12 +2466,11 @@ static unsigned menu_displaylist_parse_cores(
       }
       else
       {
-         file_type          = FILE_TYPE_CORE;
+         file_type = FILE_TYPE_CORE;
          if (string_is_equal(info->label, msg_hash_to_str(MENU_ENUM_LABEL_SIDELOAD_CORE_LIST)))
             enum_idx  = MENU_ENUM_LABEL_FILE_BROWSER_SIDELOAD_CORE;
          else
             enum_idx  = MENU_ENUM_LABEL_FILE_BROWSER_CORE;
-
       }
 
       items_found++;
@@ -2486,24 +2478,6 @@ static unsigned menu_displaylist_parse_cores(
       menu_entries_append_enum(info->list, path, label,
             enum_idx,
             file_type, 0, 0);
-      if (file_type == FILE_TYPE_CORE)
-      {
-         size_t path_size   = PATH_MAX_LENGTH * sizeof(char);
-         char *core_path    = (char*)malloc(path_size);
-         char *display_name = (char*)malloc(path_size);
-
-         core_path[0]       =
-            display_name[0]    = '\0';
-
-         fill_pathname_join(core_path, dir, path, path_size);
-
-         if (core_info_list_get_display_name(list,
-                  core_path, display_name, path_size))
-            file_list_set_alt_at_offset(info->list, i, display_name);
-
-         free(core_path);
-         free(display_name);
-      }
    }
 
    string_list_free(str_list);
@@ -2511,7 +2485,46 @@ static unsigned menu_displaylist_parse_cores(
    if (items_found == 0)
       return 0;
 
-   info->need_sort = true;
+   {
+      enum msg_hash_enums enum_idx   = MSG_UNKNOWN;
+      core_info_list_t *list         = NULL;
+      const char *dir                = NULL;
+
+      core_info_get_list(&list);
+
+      menu_entries_get_last_stack(&dir, NULL, NULL, &enum_idx, NULL);
+
+      list_size = file_list_get_size(info->list);
+
+      for (i = 0; i < list_size; i++)
+      {
+         unsigned type                      = 0;
+         const char *path                   = NULL;
+
+         menu_entries_get_at_offset(info->list,
+               i, &path, NULL, &type, NULL,
+               NULL);
+
+         if (type == FILE_TYPE_CORE)
+         {
+            size_t path_size   = PATH_MAX_LENGTH * sizeof(char);
+            char *core_path    = (char*)malloc(path_size);
+            char *display_name = (char*)malloc(path_size);
+            core_path[0]       =
+            display_name[0]    = '\0';
+
+            fill_pathname_join(core_path, dir, path, path_size);
+
+            if (core_info_list_get_display_name(list,
+                     core_path, display_name, path_size))
+               file_list_set_alt_at_offset(info->list, i, display_name);
+
+            free(core_path);
+            free(display_name);
+         }
+      }
+      info->need_sort = true;
+   }
 
    return items_found;
 }