From af12858953c318e1259cddcaa8ac95b3bff6368b Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 12 Jan 2018 04:02:14 +0100
Subject: [PATCH] Try to have a more robust fallback path for
 menu_displaylist_parse_generic

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

diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index b9f7e9b0b6..0d32fa72d4 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -1252,15 +1252,12 @@ static int menu_displaylist_parse_playlist(menu_displaylist_info_t *info,
    size_t selection = menu_navigation_get_selection();
 
    if (!playlist)
-      return -1;
+      goto error;
 
    list_size = playlist_size(playlist);
 
    if (list_size == 0)
-   {
-      info->need_push_no_playlist_entries = true;
-      return 0;
-   }
+      goto error;
 
    if (!string_is_empty(info->path))
    {
@@ -1358,6 +1355,10 @@ static int menu_displaylist_parse_playlist(menu_displaylist_info_t *info,
    }
 
    return 0;
+
+error:
+   info->need_push_no_playlist_entries = true;
+   return 0;
 }
 
 static int menu_displaylist_parse_shader_options(menu_displaylist_info_t *info)