2 files changed, 7 insertions, 13 deletions

diff --git a/apps/filetree.c b/apps/filetree.c
index 1944713d13..136a3f2ff2 100644
--- a/apps/filetree.c
+++ b/apps/filetree.c
@@ -89,7 +89,8 @@ int ft_build_playlist(struct tree_context* c, int start_index)
  * avoid allocating yet another path buffer on the stack (and save some
  * code; the caller typically needs to create the full pathname anyway)...
  */
-bool ft_play_playlist(char* pathname, char* dirname, char* filename, bool skip_dyn_warning)
+bool ft_play_playlist(char* pathname, char* dirname,
+                      char* filename, bool skip_warn_and_bookmarks)
 {
     if (global_settings.party_mode && audio_status())
     {
@@ -97,22 +98,14 @@ bool ft_play_playlist(char* pathname, char* dirname, char* filename, bool skip_d
         return false;
     }
 
-    if (bookmark_autoload(pathname))
+    if (!skip_warn_and_bookmarks)
     {
-        return false;
+        if (bookmark_autoload(pathname) || !warn_on_pl_erase())
+            return false;
     }
 
     splash(0, ID2P(LANG_WAIT));
 
-    /* about to create a new current playlist...
-     * allow user to cancel the operation.
-     * Do not show if skip_dyn_warning is true */
-    if (!skip_dyn_warning)
-    {
-        if (!warn_on_pl_erase())
-            return false;
-    }
-
     if (playlist_create(dirname, filename) != -1)
     {
         if (global_settings.playlist_shuffle)
diff --git a/apps/filetree.h b/apps/filetree.h
index 178ba0e973..7931c3c454 100644
--- a/apps/filetree.h
+++ b/apps/filetree.h
@@ -26,6 +26,7 @@ int ft_load(struct tree_context* c, const char* tempdir);
 int ft_enter(struct tree_context* c);
 int ft_exit(struct tree_context* c);
 int ft_build_playlist(struct tree_context* c, int start_index);
-bool ft_play_playlist(char* pathname, char* dirname, char* filename, bool skip_dyn_warning);
+bool ft_play_playlist(char* pathname, char* dirname,
+                      char* filename, bool skip_warn_and_bookmarks);
 
 #endif