summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2005-01-02 12:08:34 +0000
committerJens Arnold <amiconn@rockbox.org>2005-01-02 12:08:34 +0000
commit98ccef267f033fa444a0ca269ec3037a3f7115d7 (patch)
treebb7aed9527cd7c3898ab9eaad9d06af71fda21b7 /apps
parent5bdac4875c8d72f2780c8812d07c6e168112af78 (diff)
downloadrockbox-98ccef267f033fa444a0ca269ec3037a3f7115d7.tar.gz
rockbox-98ccef267f033fa444a0ca269ec3037a3f7115d7.tar.bz2
rockbox-98ccef267f033fa444a0ca269ec3037a3f7115d7.zip
Prevent entering the menu when returning from a subroutine with MODE-repeat events still in the queue (e.g. from renaming a file) (Ondio)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5526 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/tree.c4
-rw-r--r--apps/tree.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/apps/tree.c b/apps/tree.c
index 71af90f017..2d82e518e2 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -1384,6 +1384,10 @@ static bool dirbrowse(const char *root, const int *dirfilter)
#endif
case TREE_MENU:
+#ifdef TREE_MENU_PRE
+ if (lastbutton != TREE_MENU_PRE)
+ break;
+#endif
if (*dirfilter < NUM_FILTER_MODES)
{
lcd_stop_scroll();
diff --git a/apps/tree.h b/apps/tree.h
index f22163ae25..f76df90463 100644
--- a/apps/tree.h
+++ b/apps/tree.h
@@ -87,6 +87,7 @@
#define TREE_RUN (BUTTON_RIGHT | BUTTON_REL)
#define TREE_RUN_PRE BUTTON_RIGHT
#define TREE_MENU (BUTTON_MENU | BUTTON_REPEAT)
+#define TREE_MENU_PRE BUTTON_MENU
#define TREE_WPS (BUTTON_MENU | BUTTON_REL)
#define TREE_WPS_PRE BUTTON_MENU
#define TREE_CONTEXT (BUTTON_RIGHT | BUTTON_REPEAT)