summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Holmgren <magnushol@gmail.com>2007-08-11 14:44:05 +0000
committerMagnus Holmgren <magnushol@gmail.com>2007-08-11 14:44:05 +0000
commit9824dac9e5ff2856cb64980f3bddf21d9a6faa26 (patch)
tree293835e03c620859e104bbe07ac7c6fc040795ff
parente8361ef2c4541f375a14bda1f34a222298e5dc5d (diff)
Fix bug that caused the bookmark autoload screen to always resume the first bookmark, even if another was selected. Also remove a bogus comment.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14284 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/bookmark.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/apps/bookmark.c b/apps/bookmark.c
index b350cccd3a..fa1bd4751d 100644
--- a/apps/bookmark.c
+++ b/apps/bookmark.c
@@ -401,9 +401,9 @@ bool bookmark_autoload(const char* file)
{
char* bookmark = select_bookmark(global_bookmark_file_name, true);
- if (bookmark)
+ if (bookmark != NULL)
{
- return bookmark_load(global_bookmark_file_name, true);
+ return play_bookmark(bookmark);
}
return false;
@@ -452,7 +452,6 @@ static int get_bookmark_count(const char* bookmark_file_name)
if(file < 0)
return -1;
- /* Get the requested bookmark */
while(read_line(file, global_read_buffer, sizeof(global_read_buffer)) > 0)
{
read_count++;