diff options
author | Jonas Häggqvist <rasher@rasher.dk> | 2005-08-17 17:53:54 +0000 |
---|---|---|
committer | Jonas Häggqvist <rasher@rasher.dk> | 2005-08-17 17:53:54 +0000 |
commit | 280d9cc00a6ca30b4cdd30629289d92efd132c3a (patch) | |
tree | 7d857c87490046fb42675d97133c95abcd87aeb1 /apps/filetree.c | |
parent | b2b0a7ebcb391aefeac0116a4aebef66571f1829 (diff) | |
download | rockbox-280d9cc00a6ca30b4cdd30629289d92efd132c3a.tar.gz rockbox-280d9cc00a6ca30b4cdd30629289d92efd132c3a.zip |
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
Diffstat (limited to 'apps/filetree.c')
-rw-r--r-- | apps/filetree.c | 9 |
1 files changed, 4 insertions, 5 deletions
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) | |||
218 | (((len == 1) && | 218 | (((len == 1) && |
219 | (!strncmp(entry->d_name, ".", 1))) || | 219 | (!strncmp(entry->d_name, ".", 1))) || |
220 | ((len == 2) && | 220 | ((len == 2) && |
221 | (!strncmp(entry->d_name, "..", 2))) || | 221 | (!strncmp(entry->d_name, "..", 2))))) { |
222 | c->hidedirs)) { | ||
223 | i--; | 222 | i--; |
224 | continue; | 223 | continue; |
225 | } | 224 | } |
@@ -258,19 +257,19 @@ int ft_load(struct tree_context* c, const char* tempdir) | |||
258 | #endif | 257 | #endif |
259 | 258 | ||
260 | /* filter out non-visible files */ | 259 | /* filter out non-visible files */ |
261 | if (!(dptr->attr & ATTR_DIRECTORY) && ( | 260 | if ((!(dptr->attr & ATTR_DIRECTORY) && ( |
262 | (*c->dirfilter == SHOW_PLAYLIST && | 261 | (*c->dirfilter == SHOW_PLAYLIST && |
263 | (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_M3U) || | 262 | (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_M3U) || |
264 | ((*c->dirfilter == SHOW_MUSIC && | 263 | ((*c->dirfilter == SHOW_MUSIC && |
265 | (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_MPA) && | 264 | (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_MPA) && |
266 | (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_M3U) || | 265 | (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_M3U) || |
267 | (*c->dirfilter == SHOW_SUPPORTED && !filetype_supported(dptr->attr)) || | 266 | (*c->dirfilter == SHOW_SUPPORTED && !filetype_supported(dptr->attr)))) || |
268 | (*c->dirfilter == SHOW_WPS && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_WPS) || | 267 | (*c->dirfilter == SHOW_WPS && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_WPS) || |
269 | (*c->dirfilter == SHOW_CFG && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_CFG) || | 268 | (*c->dirfilter == SHOW_CFG && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_CFG) || |
270 | (*c->dirfilter == SHOW_LNG && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_LNG) || | 269 | (*c->dirfilter == SHOW_LNG && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_LNG) || |
271 | (*c->dirfilter == SHOW_MOD && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_MOD) || | 270 | (*c->dirfilter == SHOW_MOD && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_MOD) || |
272 | (*c->dirfilter == SHOW_FONT && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_FONT) || | 271 | (*c->dirfilter == SHOW_FONT && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_FONT) || |
273 | (*c->dirfilter == SHOW_PLUGINS && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_ROCK))) | 272 | (*c->dirfilter == SHOW_PLUGINS && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_ROCK)) |
274 | { | 273 | { |
275 | i--; | 274 | i--; |
276 | continue; | 275 | continue; |