From 280d9cc00a6ca30b4cdd30629289d92efd132c3a Mon Sep 17 00:00:00 2001 From: Jonas Häggqvist Date: Wed, 17 Aug 2005 17:53:54 +0000 Subject: Undo my previous commit and do the same with a parantheses change in filetree.c git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7342 a1c6a512-1295-4272-9138-f99709370657 --- apps/filetree.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'apps/filetree.c') diff --git a/apps/filetree.c b/apps/filetree.c index e6ba08b96e..691a6adee6 100644 --- a/apps/filetree.c +++ b/apps/filetree.c @@ -218,8 +218,7 @@ int ft_load(struct tree_context* c, const char* tempdir) (((len == 1) && (!strncmp(entry->d_name, ".", 1))) || ((len == 2) && - (!strncmp(entry->d_name, "..", 2))) || - c->hidedirs)) { + (!strncmp(entry->d_name, "..", 2))))) { i--; continue; } @@ -258,19 +257,19 @@ int ft_load(struct tree_context* c, const char* tempdir) #endif /* filter out non-visible files */ - if (!(dptr->attr & ATTR_DIRECTORY) && ( + if ((!(dptr->attr & ATTR_DIRECTORY) && ( (*c->dirfilter == SHOW_PLAYLIST && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_M3U) || ((*c->dirfilter == SHOW_MUSIC && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_MPA) && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_M3U) || - (*c->dirfilter == SHOW_SUPPORTED && !filetype_supported(dptr->attr)) || + (*c->dirfilter == SHOW_SUPPORTED && !filetype_supported(dptr->attr)))) || (*c->dirfilter == SHOW_WPS && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_WPS) || (*c->dirfilter == SHOW_CFG && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_CFG) || (*c->dirfilter == SHOW_LNG && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_LNG) || (*c->dirfilter == SHOW_MOD && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_MOD) || (*c->dirfilter == SHOW_FONT && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_FONT) || - (*c->dirfilter == SHOW_PLUGINS && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_ROCK))) + (*c->dirfilter == SHOW_PLUGINS && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_ROCK)) { i--; continue; -- cgit v1.2.3