From c9a97763ef9aadf9d662b0f0ffbdab1f783b6a5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Stenberg?= <bjorn@haxx.se>
Date: Fri, 16 Jan 2004 00:21:43 +0000
Subject: [PATCH] Allow any non-play button to cancel auto-bookmark

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4245 a1c6a512-1295-4272-9138-f99709370657
---
 apps/bookmark.c | 16 +++++-----------
 1 file 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;