diff options
author | Richard Quirk <richard.quirk@gmail.com> | 2013-03-05 19:31:36 +0100 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2013-04-06 11:35:36 +0200 |
commit | dcba74155e96ef8e6da757cba239241469b5859a (patch) | |
tree | c0945c7f7330ff10e8f22b7d87b5aa46a1cf15b5 /apps | |
parent | 703bc407b4565736eb1c40f85887c84c33e37696 (diff) | |
download | rockbox-dcba74155e96ef8e6da757cba239241469b5859a.tar.gz rockbox-dcba74155e96ef8e6da757cba239241469b5859a.zip |
bookmark: add cancelling of autoload bookmark
When autoload bookmark is set to "Ask", navigate to a file with
bookmarks in that directory. Select the file and the bookmark list
appears. Even if you chose to cancel, the track started prior to this
patch.
Change-Id: I453999a9bc20faae97f9cf2080ef613c602ad8e1
Reviewed-on: http://gerrit.rockbox.org/416
Reviewed-by: Jonathan Gordon <rockbox@jdgordon.info>
Diffstat (limited to 'apps')
-rw-r--r-- | apps/bookmark.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/bookmark.c b/apps/bookmark.c index 12ec1edd0f..543e89331a 100644 --- a/apps/bookmark.c +++ b/apps/bookmark.c | |||
@@ -435,7 +435,7 @@ bool bookmark_autoload(const char* file) | |||
435 | } | 435 | } |
436 | else | 436 | else |
437 | { | 437 | { |
438 | select_bookmark(global_bookmark_file_name, true, &bookmark); | 438 | int ret = select_bookmark(global_bookmark_file_name, true, &bookmark); |
439 | 439 | ||
440 | if (bookmark != NULL) | 440 | if (bookmark != NULL) |
441 | { | 441 | { |
@@ -451,7 +451,7 @@ bool bookmark_autoload(const char* file) | |||
451 | return true; | 451 | return true; |
452 | } | 452 | } |
453 | 453 | ||
454 | return false; | 454 | return ret != BOOKMARK_SUCCESS; |
455 | } | 455 | } |
456 | } | 456 | } |
457 | 457 | ||
@@ -801,8 +801,9 @@ static int select_bookmark(const char* bookmark_file_name, bool show_dont_resume | |||
801 | *selected_bookmark = bookmarks->items[item - bookmarks->start]; | 801 | *selected_bookmark = bookmarks->items[item - bookmarks->start]; |
802 | return BOOKMARK_SUCCESS; | 802 | return BOOKMARK_SUCCESS; |
803 | } | 803 | } |
804 | 804 | exit = true; | |
805 | /* Else fall through */ | 805 | ret = BOOKMARK_SUCCESS; |
806 | break; | ||
806 | 807 | ||
807 | case ACTION_TREE_WPS: | 808 | case ACTION_TREE_WPS: |
808 | case ACTION_STD_CANCEL: | 809 | case ACTION_STD_CANCEL: |