forked from len0rd/rockbox
Voice: Don't omit "shutting down" speech warning when battery dies.
(Taken from Igor Poretsky's tree) Change-Id: I0fee8346e857eeaea5059360c0f35bd6a2e98b97
This commit is contained in:
parent
4adad0bc1f
commit
75f74814c0
1 changed files with 14 additions and 14 deletions
28
apps/misc.c
28
apps/misc.c
|
|
@ -361,20 +361,6 @@ static bool clean_shutdown(void (*callback)(void *), void *parameter)
|
|||
#endif
|
||||
scrobbler_shutdown(true);
|
||||
|
||||
if(global_settings.talk_menu)
|
||||
{
|
||||
bool enqueue = false;
|
||||
if(msg_id != -1)
|
||||
{
|
||||
talk_id(msg_id, enqueue);
|
||||
enqueue = true;
|
||||
}
|
||||
talk_id(LANG_SHUTTINGDOWN, enqueue);
|
||||
#if CONFIG_CODEC == SWCODEC
|
||||
voice_wait();
|
||||
#endif
|
||||
}
|
||||
|
||||
system_flush();
|
||||
#ifdef HAVE_EEPROM_SETTINGS
|
||||
if (firmware_settings.initialized)
|
||||
|
|
@ -390,6 +376,20 @@ static bool clean_shutdown(void (*callback)(void *), void *parameter)
|
|||
dircache_disable();
|
||||
#endif
|
||||
|
||||
if(global_settings.talk_menu)
|
||||
{
|
||||
bool enqueue = false;
|
||||
if(msg_id != -1)
|
||||
{
|
||||
talk_id(msg_id, enqueue);
|
||||
enqueue = true;
|
||||
}
|
||||
talk_id(LANG_SHUTTINGDOWN, enqueue);
|
||||
#if CONFIG_CODEC == SWCODEC
|
||||
voice_wait();
|
||||
#endif
|
||||
}
|
||||
|
||||
shutdown_hw();
|
||||
}
|
||||
return false;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue