summaryrefslogtreecommitdiffstats
path: root/apps/bookmark.c
diff options
context:
space:
mode:
authorMartin Scarratt <mmmm@rockbox.org>2006-08-20 17:25:56 +0000
committerMartin Scarratt <mmmm@rockbox.org>2006-08-20 17:25:56 +0000
commit7847dde8cf00838de8ff75b8398ffbb1921baf8b (patch)
treedf60ffec5d28ac38de63504f9f7e3c10d9654e1b /apps/bookmark.c
parentd1ee44ae59ac4764d9fe0fcf503857787ac349a9 (diff)
downloadrockbox-7847dde8cf00838de8ff75b8398ffbb1921baf8b.tar.gz
rockbox-7847dde8cf00838de8ff75b8398ffbb1921baf8b.tar.bz2
rockbox-7847dde8cf00838de8ff75b8398ffbb1921baf8b.zip
fix buttons in bookmark autoload query screen
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10665 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/bookmark.c')
-rw-r--r--apps/bookmark.c28
1 files changed, 11 insertions, 17 deletions
diff --git a/apps/bookmark.c b/apps/bookmark.c
index b1fef207a4..8c30ec1466 100644
--- a/apps/bookmark.c
+++ b/apps/bookmark.c
@@ -409,7 +409,6 @@ bool bookmark_autoload(const char* file)
int key;
int fd;
int i;
- bool done = false;
if(global_settings.autoloadbookmark == BOOKMARK_NO)
return false;
@@ -455,26 +454,21 @@ bool bookmark_autoload(const char* file)
#endif
}
- while(!done)
+ /* Wait for a key to be pushed */
+ key = get_action(CONTEXT_BOOKMARKSCREEN,TIMEOUT_BLOCK);
+ switch(key)
{
- /* Wait for a key to be pushed */
- key = get_action(CONTEXT_SETTINGS,TIMEOUT_BLOCK);
- switch(key)
- {
#ifdef HAVE_LCD_BITMAP
- case ACTION_STD_NEXT:
- return bookmark_load(global_bookmark_file_name, false);
+ case ACTION_STD_NEXT:
+ return bookmark_load(global_bookmark_file_name, false);
#endif
- case ACTION_STD_OK:
- return bookmark_load(global_bookmark_file_name, true);
-
- default:
- /* Handle sys events, ignore button releases & repeats */
- if (default_event_handler(key))
- done = true;
- break;
- }
+ case ACTION_STD_OK:
+ return bookmark_load(global_bookmark_file_name, true);
+
+ default:
+ break;
}
+
action_signalscreenchange();
return false;
}