From d0de1aafac2e262810f4f6f01af40d114263c5bb Mon Sep 17 00:00:00 2001
From: Hardeep Sidhu <dyp@pobox.com>
Date: Tue, 18 Apr 2006 16:24:12 +0000
Subject: [PATCH] Fixed problem with auto change directory not working when
 browsing plugins

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9715 a1c6a512-1295-4272-9138-f99709370657
---
 apps/playlist.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/playlist.c b/apps/playlist.c
index 7652e2924d..e96e7d30d0 100644
--- a/apps/playlist.c
+++ b/apps/playlist.c
@@ -688,17 +688,17 @@ static int add_directory_to_playlist(struct playlist_info* playlist,
     int result = 0;
     int num_files = 0;
     int i;
-    int dirfilter = global_settings.dirfilter;
     struct entry *files;
     struct tree_context* tc = tree_get_context();
+    int dirfilter = *(tc->dirfilter);
 
     /* use the tree browser dircache to load files */
-    global_settings.dirfilter = SHOW_ALL;
+    *(tc->dirfilter) = SHOW_ALL;
 
     if (ft_load(tc, dirname) < 0)
     {
         gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_DIRECTORY_ACCESS_ERROR));
-        global_settings.dirfilter = dirfilter;
+        *(tc->dirfilter) = dirfilter;
         return -1;
     }
 
@@ -788,7 +788,7 @@ static int add_directory_to_playlist(struct playlist_info* playlist,
     }
 
     /* restore dirfilter */
-    global_settings.dirfilter = dirfilter;
+    *(tc->dirfilter) = dirfilter;
 
     return result;
 }
@@ -1349,11 +1349,11 @@ static int get_next_dir(char *dir, bool is_forward, bool recursion)
 {
     struct playlist_info* playlist = &current_playlist;
     int result = -1;
-    int dirfilter = global_settings.dirfilter;
     int sort_dir = global_settings.sort_dir;
     char *start_dir = NULL;
     bool exit = false;
     struct tree_context* tc = tree_get_context();
+    int dirfilter = *(tc->dirfilter);
 
     if (recursion){
        /* start with root */
@@ -1366,7 +1366,7 @@ static int get_next_dir(char *dir, bool is_forward, bool recursion)
     }
 
     /* use the tree browser dircache to load files */
-    global_settings.dirfilter = SHOW_ALL;
+    *(tc->dirfilter) = SHOW_ALL;
 
     /* sort in another direction if previous dir is requested */
     if(!is_forward){
@@ -1443,7 +1443,7 @@ static int get_next_dir(char *dir, bool is_forward, bool recursion)
     reload_directory();
 
     /* restore dirfilter & sort_dir */
-    global_settings.dirfilter = dirfilter;
+    *(tc->dirfilter) = dirfilter;
     global_settings.sort_dir = sort_dir;
 
     /* special case if nothing found: try start searching again from root */