diff options
-rw-r--r-- | apps/bookmark.c | 28 |
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) | |||
409 | int key; | 409 | int key; |
410 | int fd; | 410 | int fd; |
411 | int i; | 411 | int i; |
412 | bool done = false; | ||
413 | 412 | ||
414 | if(global_settings.autoloadbookmark == BOOKMARK_NO) | 413 | if(global_settings.autoloadbookmark == BOOKMARK_NO) |
415 | return false; | 414 | return false; |
@@ -455,26 +454,21 @@ bool bookmark_autoload(const char* file) | |||
455 | #endif | 454 | #endif |
456 | } | 455 | } |
457 | 456 | ||
458 | while(!done) | 457 | /* Wait for a key to be pushed */ |
458 | key = get_action(CONTEXT_BOOKMARKSCREEN,TIMEOUT_BLOCK); | ||
459 | switch(key) | ||
459 | { | 460 | { |
460 | /* Wait for a key to be pushed */ | ||
461 | key = get_action(CONTEXT_SETTINGS,TIMEOUT_BLOCK); | ||
462 | switch(key) | ||
463 | { | ||
464 | #ifdef HAVE_LCD_BITMAP | 461 | #ifdef HAVE_LCD_BITMAP |
465 | case ACTION_STD_NEXT: | 462 | case ACTION_STD_NEXT: |
466 | return bookmark_load(global_bookmark_file_name, false); | 463 | return bookmark_load(global_bookmark_file_name, false); |
467 | #endif | 464 | #endif |
468 | case ACTION_STD_OK: | 465 | case ACTION_STD_OK: |
469 | return bookmark_load(global_bookmark_file_name, true); | 466 | return bookmark_load(global_bookmark_file_name, true); |
470 | 467 | ||
471 | default: | 468 | default: |
472 | /* Handle sys events, ignore button releases & repeats */ | 469 | break; |
473 | if (default_event_handler(key)) | ||
474 | done = true; | ||
475 | break; | ||
476 | } | ||
477 | } | 470 | } |
471 | |||
478 | action_signalscreenchange(); | 472 | action_signalscreenchange(); |
479 | return false; | 473 | return false; |
480 | } | 474 | } |