diff options
Diffstat (limited to 'apps/filetree.c')
-rw-r--r-- | apps/filetree.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/apps/filetree.c b/apps/filetree.c index a9670e1be7..6855d3ec5d 100644 --- a/apps/filetree.c +++ b/apps/filetree.c | |||
@@ -31,7 +31,7 @@ | |||
31 | #include "filetypes.h" | 31 | #include "filetypes.h" |
32 | #include "talk.h" | 32 | #include "talk.h" |
33 | #include "playlist.h" | 33 | #include "playlist.h" |
34 | #include "wps-display.h" | 34 | #include "gwps.h" |
35 | #include "lang.h" | 35 | #include "lang.h" |
36 | #include "language.h" | 36 | #include "language.h" |
37 | #include "screens.h" | 37 | #include "screens.h" |
@@ -273,6 +273,9 @@ int ft_load(struct tree_context* c, const char* tempdir) | |||
273 | (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_M3U) || | 273 | (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_M3U) || |
274 | (*c->dirfilter == SHOW_SUPPORTED && !filetype_supported(dptr->attr)))) || | 274 | (*c->dirfilter == SHOW_SUPPORTED && !filetype_supported(dptr->attr)))) || |
275 | (*c->dirfilter == SHOW_WPS && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_WPS) || | 275 | (*c->dirfilter == SHOW_WPS && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_WPS) || |
276 | #ifdef HAVE_REMOTE_LCD | ||
277 | (*c->dirfilter == SHOW_RWPS && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_RWPS) || | ||
278 | #endif | ||
276 | (*c->dirfilter == SHOW_CFG && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_CFG) || | 279 | (*c->dirfilter == SHOW_CFG && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_CFG) || |
277 | (*c->dirfilter == SHOW_LNG && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_LNG) || | 280 | (*c->dirfilter == SHOW_LNG && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_LNG) || |
278 | (*c->dirfilter == SHOW_MOD && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_MOD) || | 281 | (*c->dirfilter == SHOW_MOD && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_MOD) || |
@@ -381,11 +384,20 @@ int ft_enter(struct tree_context* c) | |||
381 | 384 | ||
382 | /* wps config file */ | 385 | /* wps config file */ |
383 | case TREE_ATTR_WPS: | 386 | case TREE_ATTR_WPS: |
384 | wps_load(buf,true); | 387 | wps_data_load(gui_syncwps.gui_wps[0].data, buf, true, true); |
385 | set_file(buf, global_settings.wps_file, | 388 | set_file(buf, global_settings.wps_file, |
386 | MAX_FILENAME); | 389 | MAX_FILENAME); |
387 | break; | 390 | break; |
388 | 391 | ||
392 | #ifdef HAVE_REMOTE_LCD | ||
393 | /* remote-wps config file */ | ||
394 | case TREE_ATTR_RWPS: | ||
395 | wps_data_load(gui_syncwps.gui_wps[1].data, buf, true, true); | ||
396 | set_file(buf, global_settings.rwps_file, | ||
397 | MAX_FILENAME); | ||
398 | break; | ||
399 | #endif | ||
400 | |||
389 | case TREE_ATTR_CFG: | 401 | case TREE_ATTR_CFG: |
390 | if (!settings_load_config(buf)) | 402 | if (!settings_load_config(buf)) |
391 | break; | 403 | break; |