summaryrefslogtreecommitdiffstats
path: root/apps/bookmark.c
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2004-01-16 00:21:43 +0000
committerBjörn Stenberg <bjorn@haxx.se>2004-01-16 00:21:43 +0000
commitc9a97763ef9aadf9d662b0f0ffbdab1f783b6a5b (patch)
treed2324a4ea1d33795722543f742b6435956b5ab67 /apps/bookmark.c
parentbaa991a89d86b17bdf9cc1f8190a3fa853e8ae48 (diff)
downloadrockbox-c9a97763ef9aadf9d662b0f0ffbdab1f783b6a5b.tar.gz
rockbox-c9a97763ef9aadf9d662b0f0ffbdab1f783b6a5b.tar.bz2
rockbox-c9a97763ef9aadf9d662b0f0ffbdab1f783b6a5b.zip
Allow any non-play button to cancel auto-bookmark
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4245 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/bookmark.c')
-rw-r--r--apps/bookmark.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/apps/bookmark.c b/apps/bookmark.c
index ec49595e8a..893c128a15 100644
--- a/apps/bookmark.c
+++ b/apps/bookmark.c
@@ -255,17 +255,6 @@ bool bookmark_autobookmark(void)
key = button_get(true);
switch (key)
{
- case BUTTON_DOWN | BUTTON_REL:
- case BUTTON_ON | BUTTON_REL:
-#ifdef HAVE_RECORDER_KEYPAD
- case BUTTON_OFF | BUTTON_REL:
- case BUTTON_RIGHT | BUTTON_REL:
- case BUTTON_UP | BUTTON_REL:
-#endif
- case BUTTON_LEFT | BUTTON_REL:
- done = true;
- break;
-
case BUTTON_PLAY | BUTTON_REL:
if (global_settings.autocreatebookmark ==
BOOKMARK_RECENT_ONLY_ASK)
@@ -281,6 +270,11 @@ bool bookmark_autobookmark(void)
status_set_param(true);
#endif
return false;
+
+ default:
+ if (key & BUTTON_REL)
+ done = true;
+ break;
}
}
return true;