From 3945b791611a6efd523f9b73cb95cbcf3f0a9197 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 23 Jul 2016 09:48:29 +0200 Subject: [PATCH] This should hide the 'black square' bug --- file_path_special.h | 1 + file_path_str.c | 2 ++ menu/menu_displaylist.c | 8 ++++++++ 3 files changed, 11 insertions(+) diff --git a/file_path_special.h b/file_path_special.h index 612c431a23..53dda5ee32 100644 --- a/file_path_special.h +++ b/file_path_special.h @@ -65,6 +65,7 @@ enum file_path_enum FILE_PATH_REMAP_EXTENSION, FILE_PATH_CHT_EXTENSION, FILE_PATH_LPL_EXTENSION, + FILE_PATH_LPL_EXTENSION_NO_DOT, FILE_PATH_RDB_EXTENSION, FILE_PATH_BSV_EXTENSION, FILE_PATH_AUTO_EXTENSION, diff --git a/file_path_str.c b/file_path_str.c index 7d89989fbf..aeb7d6b7ec 100644 --- a/file_path_str.c +++ b/file_path_str.c @@ -67,6 +67,8 @@ const char *file_path_str(enum file_path_enum enum_idx) return ".state"; case FILE_PATH_LPL_EXTENSION: return ".lpl"; + case FILE_PATH_LPL_EXTENSION_NO_DOT: + return "lpl"; case FILE_PATH_PNG_EXTENSION: return ".png"; case FILE_PATH_UPS_EXTENSION: diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 880bfbbeaf..d98e495c07 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -3205,6 +3205,10 @@ static int menu_displaylist_parse_playlists( if (file_type == FILE_TYPE_DIRECTORY) continue; + if (!string_list_find_elem_prefix(str_list, ".", + file_path_str(FILE_PATH_LPL_EXTENSION_NO_DOT))) + continue; + file_type = FILE_TYPE_PLAYLIST_COLLECTION; /* Need to preserve slash first time. */ @@ -3222,7 +3226,11 @@ static int menu_displaylist_parse_playlists( string_list_free(str_list); if (items_found == 0) + { + if (horizontal) + return 0; goto no_playlists; + } return 0;