1 files changed, 6 insertions, 4 deletions

diff --git a/apps/playlist.c b/apps/playlist.c
index 924b9041e8..5eb7d6b450 100644
--- a/apps/playlist.c
+++ b/apps/playlist.c
@@ -545,15 +545,17 @@ static int add_directory_to_playlist(struct playlist_info* playlist,
 
     /* use the tree browser dircache to load files */
     global_settings.dirfilter = SHOW_ALL;
-    num_files = ft_load(tc, dirname);
-    files = (struct entry*) tc->dircache;
 
-    if(!num_files)
+    if (ft_load(tc, dirname) < 0)
     {
         splash(HZ*2, true, str(LANG_PLAYLIST_DIRECTORY_ACCESS_ERROR));
-        return 0;
+        global_settings.dirfilter = dirfilter;
+        return -1;
     }
 
+    files = (struct entry*) tc->dircache;
+    num_files = tc->filesindir;
+
     /* we've overwritten the dircache so tree browser will need to be
        reloaded */
     reload_directory();