diff options
author | Björn Stenberg <bjorn@haxx.se> | 2004-01-16 00:21:43 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2004-01-16 00:21:43 +0000 |
commit | c9a97763ef9aadf9d662b0f0ffbdab1f783b6a5b (patch) | |
tree | d2324a4ea1d33795722543f742b6435956b5ab67 | |
parent | baa991a89d86b17bdf9cc1f8190a3fa853e8ae48 (diff) | |
download | rockbox-c9a97763ef9aadf9d662b0f0ffbdab1f783b6a5b.tar.gz 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
-rw-r--r-- | apps/bookmark.c | 16 |
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) | |||
255 | key = button_get(true); | 255 | key = button_get(true); |
256 | switch (key) | 256 | switch (key) |
257 | { | 257 | { |
258 | case BUTTON_DOWN | BUTTON_REL: | ||
259 | case BUTTON_ON | BUTTON_REL: | ||
260 | #ifdef HAVE_RECORDER_KEYPAD | ||
261 | case BUTTON_OFF | BUTTON_REL: | ||
262 | case BUTTON_RIGHT | BUTTON_REL: | ||
263 | case BUTTON_UP | BUTTON_REL: | ||
264 | #endif | ||
265 | case BUTTON_LEFT | BUTTON_REL: | ||
266 | done = true; | ||
267 | break; | ||
268 | |||
269 | case BUTTON_PLAY | BUTTON_REL: | 258 | case BUTTON_PLAY | BUTTON_REL: |
270 | if (global_settings.autocreatebookmark == | 259 | if (global_settings.autocreatebookmark == |
271 | BOOKMARK_RECENT_ONLY_ASK) | 260 | BOOKMARK_RECENT_ONLY_ASK) |
@@ -281,6 +270,11 @@ bool bookmark_autobookmark(void) | |||
281 | status_set_param(true); | 270 | status_set_param(true); |
282 | #endif | 271 | #endif |
283 | return false; | 272 | return false; |
273 | |||
274 | default: | ||
275 | if (key & BUTTON_REL) | ||
276 | done = true; | ||
277 | break; | ||
284 | } | 278 | } |
285 | } | 279 | } |
286 | return true; | 280 | return true; |