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/misc.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/misc.c')
-rw-r--r-- | apps/misc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/misc.c b/apps/misc.c index 554d29e630..f9c6116205 100644 --- a/apps/misc.c +++ b/apps/misc.c | |||
@@ -291,7 +291,7 @@ static bool clean_shutdown(void (*callback)(void *), void *parameter) | |||
291 | #ifdef SIMULATOR | 291 | #ifdef SIMULATOR |
292 | (void)callback; | 292 | (void)callback; |
293 | (void)parameter; | 293 | (void)parameter; |
294 | bookmark_autobookmark(); | 294 | bookmark_autobookmark(false); |
295 | call_storage_idle_notifys(true); | 295 | call_storage_idle_notifys(true); |
296 | exit(0); | 296 | exit(0); |
297 | #else | 297 | #else |
@@ -356,7 +356,7 @@ static bool clean_shutdown(void (*callback)(void *), void *parameter) | |||
356 | sleep(1); | 356 | sleep(1); |
357 | } | 357 | } |
358 | #endif | 358 | #endif |
359 | bookmark_autobookmark(); | 359 | bookmark_autobookmark(false); |
360 | 360 | ||
361 | /* audio_stop_recording == audio_stop for HWCODEC */ | 361 | /* audio_stop_recording == audio_stop for HWCODEC */ |
362 | audio_stop(); | 362 | audio_stop(); |
@@ -420,7 +420,7 @@ bool list_stop_handler(void) | |||
420 | { | 420 | { |
421 | if (global_settings.fade_on_stop) | 421 | if (global_settings.fade_on_stop) |
422 | fade(false, false); | 422 | fade(false, false); |
423 | bookmark_autobookmark(); | 423 | bookmark_autobookmark(true); |
424 | audio_stop(); | 424 | audio_stop(); |
425 | ret = true; /* bookmarking can make a refresh necessary */ | 425 | ret = true; /* bookmarking can make a refresh necessary */ |
426 | } | 426 | } |