From 7df7d76131dce6f8b0e64bc7ad2d15a40b7ea819 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 6 Sep 2015 19:31:43 +0200
Subject: [PATCH] Cleanups

---
 menu/menu_displaylist.c | 60 ++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 31 deletions(-)

diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index fc220a96ab..0df712349e 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -2750,37 +2750,6 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
          info->type_default = MENU_FILE_RDB;
          strlcpy(info->exts, "rdb", sizeof(info->exts));
          strlcpy(info->path, settings->content_database, sizeof(info->path));
-         if (menu_displaylist_parse_generic(info, &need_sort) == 0)
-         {
-            need_refresh = true;
-            need_push    = true;
-         }
-         break;
-      case DISPLAYLIST_DEFAULT:
-      case DISPLAYLIST_CORES:
-      case DISPLAYLIST_CORES_DETECTED:
-      case DISPLAYLIST_SHADER_PASS:
-      case DISPLAYLIST_SHADER_PRESET:
-      case DISPLAYLIST_DATABASE_CURSORS:
-      case DISPLAYLIST_DATABASE_PLAYLISTS:
-      case DISPLAYLIST_VIDEO_FILTERS:
-      case DISPLAYLIST_AUDIO_FILTERS:
-      case DISPLAYLIST_IMAGES:
-      case DISPLAYLIST_OVERLAYS:
-      case DISPLAYLIST_FONTS:
-      case DISPLAYLIST_CHEAT_FILES:
-      case DISPLAYLIST_REMAP_FILES:
-      case DISPLAYLIST_RECORD_CONFIG_FILES:
-      case DISPLAYLIST_CONFIG_FILES:
-      case DISPLAYLIST_CONTENT_HISTORY:
-         if (menu_displaylist_parse_generic(info, &need_sort) == 0)
-         {
-            need_refresh = true;
-            need_push    = true;
-         }
-         break;
-      case DISPLAYLIST_DATABASE_PLAYLISTS_HORIZONTAL:
-         menu_displaylist_parse_generic(info, &need_sort);
          break;
       case DISPLAYLIST_ARCHIVE_ACTION:
          menu_list_push(info->list,
@@ -2806,6 +2775,35 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
          break;
    }
 
+   switch (type)
+   {
+      case DISPLAYLIST_DATABASES:
+      case DISPLAYLIST_DEFAULT:
+      case DISPLAYLIST_CORES:
+      case DISPLAYLIST_CORES_DETECTED:
+      case DISPLAYLIST_SHADER_PASS:
+      case DISPLAYLIST_SHADER_PRESET:
+      case DISPLAYLIST_DATABASE_CURSORS:
+      case DISPLAYLIST_DATABASE_PLAYLISTS:
+      case DISPLAYLIST_VIDEO_FILTERS:
+      case DISPLAYLIST_AUDIO_FILTERS:
+      case DISPLAYLIST_IMAGES:
+      case DISPLAYLIST_OVERLAYS:
+      case DISPLAYLIST_FONTS:
+      case DISPLAYLIST_CHEAT_FILES:
+      case DISPLAYLIST_REMAP_FILES:
+      case DISPLAYLIST_RECORD_CONFIG_FILES:
+      case DISPLAYLIST_CONFIG_FILES:
+      case DISPLAYLIST_CONTENT_HISTORY:
+      case DISPLAYLIST_DATABASE_PLAYLISTS_HORIZONTAL:
+         if (menu_displaylist_parse_generic(info, &need_sort) == 0)
+         {
+            need_refresh = true;
+            need_push    = true;
+         }
+         break;
+   }
+
    if (need_sort)
       file_list_sort_on_alt(info->list);