len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix "bookmark on stop: ask" when idle poweroff triggers.

Browse source 
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
This commit is contained in:
Torne Wuff 2010-03-28 23:27:49 +00:00
parent 8132852bf2
commit 05ace8e095
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/bookmark.c
View file

@ -159,7 +159,7 @@ bool bookmark_mrb_load()
/* This function handles an autobookmark creation. This is an interface */
/* function. */
/* ----------------------------------------------------------------------- */
bool bookmark_autobookmark(void)
bool bookmark_autobookmark(bool prompt_ok)
{
char* bookmark;
if (!system_check())
@ -192,7 +192,7 @@ bool bookmark_autobookmark(void)
const struct text_message message={lines, 2};
#endif
if(gui_syncyesno_run(&message, NULL, NULL)==YESNO_YES)
if(prompt_ok && gui_syncyesno_run(&message, NULL, NULL)==YESNO_YES)
{
if (global_settings.autocreatebookmark == BOOKMARK_RECENT_ONLY_ASK)
return write_bookmark(false, bookmark);

2
apps/bookmark.h
View file

@ -24,7 +24,7 @@
#include <stdbool.h>
bool bookmark_load_menu(void);
bool bookmark_autobookmark(void);
bool bookmark_autobookmark(bool prompt_ok);
bool bookmark_create_menu(void);
bool bookmark_mrb_load(void);
bool bookmark_autoload(const char* file);

2
apps/gui/wps.c
View file

@ -1258,7 +1258,7 @@ long gui_wps_show(void)
fade(false, true);
if (bookmark)
bookmark_autobookmark();
bookmark_autobookmark(true);
audio_stop();
#ifdef AB_REPEAT_ENABLE
ab_reset_markers();

6
apps/misc.c
View file

@ -291,7 +291,7 @@ static bool clean_shutdown(void (*callback)(void *), void *parameter)
#ifdef SIMULATOR
(void)callback;
(void)parameter;
bookmark_autobookmark();
bookmark_autobookmark(false);
call_storage_idle_notifys(true);
exit(0);
#else
@ -356,7 +356,7 @@ static bool clean_shutdown(void (*callback)(void *), void *parameter)
sleep(1);
}
#endif
bookmark_autobookmark();
bookmark_autobookmark(false);
/* audio_stop_recording == audio_stop for HWCODEC */
audio_stop();
@ -420,7 +420,7 @@ bool list_stop_handler(void)
{
if (global_settings.fade_on_stop)
fade(false, false);
bookmark_autobookmark();
bookmark_autobookmark(true);
audio_stop();
ret = true; /* bookmarking can make a refresh necessary */
}