1
0
Fork 0
forked from len0rd/rockbox

fix buttons in bookmark autoload query screen

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10665 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Martin Scarratt 2006-08-20 17:25:56 +00:00
parent d1ee44ae59
commit 7847dde8cf

View file

@ -409,7 +409,6 @@ bool bookmark_autoload(const char* file)
int key; int key;
int fd; int fd;
int i; int i;
bool done = false;
if(global_settings.autoloadbookmark == BOOKMARK_NO) if(global_settings.autoloadbookmark == BOOKMARK_NO)
return false; return false;
@ -455,26 +454,21 @@ bool bookmark_autoload(const char* file)
#endif #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 #ifdef HAVE_LCD_BITMAP
case ACTION_STD_NEXT: case ACTION_STD_NEXT:
return bookmark_load(global_bookmark_file_name, false); return bookmark_load(global_bookmark_file_name, false);
#endif #endif
case ACTION_STD_OK: case ACTION_STD_OK:
return bookmark_load(global_bookmark_file_name, true); return bookmark_load(global_bookmark_file_name, true);
default: default:
/* Handle sys events, ignore button releases & repeats */ break;
if (default_event_handler(key))
done = true;
break;
}
} }
action_signalscreenchange(); action_signalscreenchange();
return false; return false;
} }