diff options
author | Torne Wuff <torne@wolfpuppy.org.uk> | 2010-03-28 23:27:49 +0000 |
---|---|---|
committer | Torne Wuff <torne@wolfpuppy.org.uk> | 2010-03-28 23:27:49 +0000 |
commit | 05ace8e095f3de6332560b364a158321867c7bba (patch) | |
tree | 8a4b7e12ee6f716cf5a32765c620c65549451e52 /apps/bookmark.c | |
parent | 8132852bf2ed6ec9d6cc5fbcc5327b6f683dd708 (diff) | |
download | rockbox-05ace8e095f3de6332560b364a158321867c7bba.tar.gz rockbox-05ace8e095f3de6332560b364a158321867c7bba.zip |
Fix "bookmark on stop: ask" when idle poweroff triggers.
Previously, the prompt would come up during poweroff, and then if the user did not respond, the shutdown timeout would be hit and a hard poweroff would happen, which is bad. Now it just assumes you don't want a bookmark.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25376 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/bookmark.c')
-rw-r--r-- | apps/bookmark.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/bookmark.c b/apps/bookmark.c index 85570839be..dd800f75c0 100644 --- a/apps/bookmark.c +++ b/apps/bookmark.c | |||
@@ -159,7 +159,7 @@ bool bookmark_mrb_load() | |||
159 | /* This function handles an autobookmark creation. This is an interface */ | 159 | /* This function handles an autobookmark creation. This is an interface */ |
160 | /* function. */ | 160 | /* function. */ |
161 | /* ----------------------------------------------------------------------- */ | 161 | /* ----------------------------------------------------------------------- */ |
162 | bool bookmark_autobookmark(void) | 162 | bool bookmark_autobookmark(bool prompt_ok) |
163 | { | 163 | { |
164 | char* bookmark; | 164 | char* bookmark; |
165 | if (!system_check()) | 165 | if (!system_check()) |
@@ -192,7 +192,7 @@ bool bookmark_autobookmark(void) | |||
192 | const struct text_message message={lines, 2}; | 192 | const struct text_message message={lines, 2}; |
193 | #endif | 193 | #endif |
194 | 194 | ||
195 | if(gui_syncyesno_run(&message, NULL, NULL)==YESNO_YES) | 195 | if(prompt_ok && gui_syncyesno_run(&message, NULL, NULL)==YESNO_YES) |
196 | { | 196 | { |
197 | if (global_settings.autocreatebookmark == BOOKMARK_RECENT_ONLY_ASK) | 197 | if (global_settings.autocreatebookmark == BOOKMARK_RECENT_ONLY_ASK) |
198 | return write_bookmark(false, bookmark); | 198 | return write_bookmark(false, bookmark); |