devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Voice: Don't omit "shutting down" speech warning when battery dies.

Browse source 
(Taken from Igor Poretsky's tree)

Change-Id: I0fee8346e857eeaea5059360c0f35bd6a2e98b97
This commit is contained in:
Solomon Peachy 2018-12-08 20:06:55 -05:00
parent 4adad0bc1f
commit 75f74814c0
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
apps/misc.c
View file

@ -361,20 +361,6 @@ static bool clean_shutdown(void (*callback)(void *), void *parameter)
#endif #endif
scrobbler_shutdown(true); 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(); system_flush();
#ifdef HAVE_EEPROM_SETTINGS #ifdef HAVE_EEPROM_SETTINGS
if (firmware_settings.initialized) if (firmware_settings.initialized)
@ -390,6 +376,20 @@ static bool clean_shutdown(void (*callback)(void *), void *parameter)
dircache_disable(); dircache_disable();
#endif #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(); shutdown_hw();
} }
return false; return false;