From ffeccda8cd246b261a7a0cad1167b10fe2119788 Mon Sep 17 00:00:00 2001
From: Jonathan Gordon <rockbox@jdgordon.info>
Date: Wed, 25 Jul 2007 12:37:09 +0000
Subject: [PATCH] Fix the bug where holding left no longer stopped at the
 browser root.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13983 a1c6a512-1295-4272-9138-f99709370657
---
 apps/gui/list.c | 8 ++++----
 apps/tree.c     | 7 +------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/apps/gui/list.c b/apps/gui/list.c
index 0cc3257246..f12d8a3d91 100644
--- a/apps/gui/list.c
+++ b/apps/gui/list.c
@@ -984,6 +984,10 @@ unsigned gui_synclist_do_button(struct gui_synclist * lists,
             return ACTION_STD_NEXT;
 
 #ifdef HAVE_LCD_BITMAP
+        case ACTION_TREE_PGRIGHT:
+            gui_synclist_scroll_right(lists);
+            gui_synclist_draw(lists);
+            return ACTION_TREE_PGRIGHT;
         case ACTION_TREE_ROOT_INIT:
          /* After this button press ACTION_TREE_PGLEFT is allowed
             to skip to root. ACTION_TREE_ROOT_INIT must be defined in the
@@ -995,10 +999,6 @@ unsigned gui_synclist_do_button(struct gui_synclist * lists,
                 scrolling_left = false;
                 return ACTION_STD_CANCEL;
             }
-        case ACTION_TREE_PGRIGHT:
-            gui_synclist_scroll_right(lists);
-            gui_synclist_draw(lists);
-            return ACTION_TREE_PGRIGHT;
         case ACTION_TREE_PGLEFT:
             if(!scrolling_left && (lists->gui_list[0].offset_position == 0))
                 return ACTION_STD_CANCEL;
diff --git a/apps/tree.c b/apps/tree.c
index 5b159d14bc..9ebf91d18e 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -523,7 +523,6 @@ static int dirbrowse()
     bool need_update = true;
     bool exit_func = false;
     long thumbnail_time = -1; /* for delaying a thumbnail */
-    long last_cancel = 0;
 
     char* currdir = tc.currdir; /* just a shortcut */
 #ifdef HAVE_TAGCACHE
@@ -605,15 +604,11 @@ static int dirbrowse()
                 if ((*tc.dirfilter == SHOW_ID3DB && tc.dirlevel == 0) ||
                     ((*tc.dirfilter != SHOW_ID3DB && !strcmp(currdir,"/"))))
                 {
-                    if (last_cancel && TIME_BEFORE(current_tick, last_cancel+HZ/2))
-                    {
-                        last_cancel = 0;
+                    if (returned_button == ACTION_STD_CANCEL)
                         break;
-                    }
                     else
                         return GO_TO_ROOT;
                 }
-                last_cancel = current_tick;
                 
 #ifdef HAVE_TAGCACHE
                 if (id3db)