From 24697a37b4627dc1bf18345df8d8d87646e8e067 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 9 Jun 2015 02:49:06 +0200 Subject: [PATCH] Fix Load Content (History) --- menu/menu_displaylist.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 384c32dac6..4ce9c8aa57 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -693,7 +693,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info) } static int menu_displaylist_parse_playlist(menu_displaylist_info_t *info, - content_playlist_t *playlist, const char *path_playlist) + content_playlist_t *playlist, const char *path_playlist, bool is_history) { unsigned i; size_t list_size = 0; @@ -751,7 +751,7 @@ static int menu_displaylist_parse_playlist(menu_displaylist_info_t *info, } } - if (core_detected && db_name[0] != '\0') + if (!is_history && core_detected && db_name[0] != '\0') { char db_path[PATH_MAX_LENGTH]; @@ -1391,7 +1391,7 @@ static int menu_displaylist_parse_horizontal_list(menu_displaylist_info_t *info) strlcpy(path_playlist, "collection", sizeof(path_playlist)); playlist = menu->playlist; - menu_displaylist_parse_playlist(info, playlist, path_playlist); + menu_displaylist_parse_playlist(info, playlist, path_playlist, false); return 0; } @@ -1945,7 +1945,7 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type) strlcpy(path_playlist, "collection", sizeof(path_playlist)); playlist = menu->playlist; - ret = menu_displaylist_parse_playlist(info, playlist, path_playlist); + ret = menu_displaylist_parse_playlist(info, playlist, path_playlist, false); if (ret == 0) { @@ -1961,7 +1961,7 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type) content_playlist_t *playlist = g_defaults.history; strlcpy(path_playlist, "history", sizeof(path_playlist)); - ret = menu_displaylist_parse_playlist(info, playlist, path_playlist); + ret = menu_displaylist_parse_playlist(info, playlist, path_playlist, true); if (ret == 0) {