summaryrefslogtreecommitdiff
path: root/apps/filetree.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/filetree.c')
-rw-r--r--apps/filetree.c24
1 files changed, 5 insertions, 19 deletions
diff --git a/apps/filetree.c b/apps/filetree.c
index dd541fe0a2..64a12b5050 100644
--- a/apps/filetree.c
+++ b/apps/filetree.c
@@ -42,6 +42,7 @@
42#include "yesno.h" 42#include "yesno.h"
43#include "cuesheet.h" 43#include "cuesheet.h"
44#include "filetree.h" 44#include "filetree.h"
45#include "misc.h"
45#ifdef HAVE_LCD_BITMAP 46#ifdef HAVE_LCD_BITMAP
46#include "keyboard.h" 47#include "keyboard.h"
47#endif 48#endif
@@ -102,15 +103,8 @@ bool ft_play_playlist(char* pathname, char* dirname, char* filename)
102 103
103 /* about to create a new current playlist... 104 /* about to create a new current playlist...
104 allow user to cancel the operation */ 105 allow user to cancel the operation */
105 if (global_settings.warnon_erase_dynplaylist && 106 if (!warn_on_pl_erase())
106 playlist_modified(NULL)) 107 return false;
107 {
108 const char *lines[] = {ID2P(LANG_WARN_ERASEDYNPLAYLIST_PROMPT)};
109 struct text_message message = {lines, 1};
110
111 if (gui_syncyesno_run(&message, NULL, NULL) != YESNO_YES)
112 return false;
113 }
114 108
115 if (playlist_create(dirname, filename) != -1) 109 if (playlist_create(dirname, filename) != -1)
116 { 110 {
@@ -405,16 +399,8 @@ int ft_enter(struct tree_context* c)
405 399
406 /* about to create a new current playlist... 400 /* about to create a new current playlist...
407 allow user to cancel the operation */ 401 allow user to cancel the operation */
408 if (global_settings.warnon_erase_dynplaylist && 402 if (!warn_on_pl_erase())
409 !global_settings.party_mode && 403 break;
410 playlist_modified(NULL))
411 {
412 static const char *lines[]={ID2P(LANG_WARN_ERASEDYNPLAYLIST_PROMPT)};
413 static const struct text_message message={lines, 1};
414
415 if(gui_syncyesno_run(&message, NULL, NULL) != YESNO_YES)
416 break;
417 }
418 404
419 if (global_settings.party_mode) 405 if (global_settings.party_mode)
420 { 406 {