summaryrefslogtreecommitdiffstats
path: root/apps/tree.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/tree.c')
-rw-r--r--apps/tree.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/tree.c b/apps/tree.c
index 5dd88c8e9d..b9b257e093 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -652,7 +652,7 @@ static int dirbrowse(void)
return GO_TO_PREVIOUS; /* No files found for rockbox_browse() */
}
- while(1) {
+ while(tc.browse) {
bool restore = false;
if (tc.dirlevel < 0)
tc.dirlevel = 0; /* shouldnt be needed.. this code needs work! */
@@ -1018,7 +1018,7 @@ int rockbox_browse(struct browse_context *browse)
}
else
{
- if (dirfilter != SHOW_ID3DB)
+ if (dirfilter != SHOW_ID3DB && (browse->flags & BROWSE_DIRFILTER) == 0)
tc.dirfilter = &global_settings.dirfilter;
tc.browse = browse;
strmemccpy(current, browse->root, MAX_PATH);