diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2018-12-08 20:06:55 -0500 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2018-12-15 12:02:21 -0500 |
commit | 75f74814c00383de4fc7b134a26fd10ee2eb8486 (patch) | |
tree | 65bc85c5e5f786b933f6e3b37a277b42a9fd9bd5 /apps | |
parent | 4adad0bc1f508360999de176048f89025ce84b3e (diff) | |
download | rockbox-75f74814c00383de4fc7b134a26fd10ee2eb8486.tar.gz rockbox-75f74814c00383de4fc7b134a26fd10ee2eb8486.zip |
Voice: Don't omit "shutting down" speech warning when battery dies.
(Taken from Igor Poretsky's tree)
Change-Id: I0fee8346e857eeaea5059360c0f35bd6a2e98b97
Diffstat (limited to 'apps')
-rw-r--r-- | apps/misc.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/apps/misc.c b/apps/misc.c index b3ae8e9af5..b43d347d91 100644 --- a/apps/misc.c +++ b/apps/misc.c | |||
@@ -361,20 +361,6 @@ static bool clean_shutdown(void (*callback)(void *), void *parameter) | |||
361 | #endif | 361 | #endif |
362 | scrobbler_shutdown(true); | 362 | scrobbler_shutdown(true); |
363 | 363 | ||
364 | if(global_settings.talk_menu) | ||
365 | { | ||
366 | bool enqueue = false; | ||
367 | if(msg_id != -1) | ||
368 | { | ||
369 | talk_id(msg_id, enqueue); | ||
370 | enqueue = true; | ||
371 | } | ||
372 | talk_id(LANG_SHUTTINGDOWN, enqueue); | ||
373 | #if CONFIG_CODEC == SWCODEC | ||
374 | voice_wait(); | ||
375 | #endif | ||
376 | } | ||
377 | |||
378 | system_flush(); | 364 | system_flush(); |
379 | #ifdef HAVE_EEPROM_SETTINGS | 365 | #ifdef HAVE_EEPROM_SETTINGS |
380 | if (firmware_settings.initialized) | 366 | if (firmware_settings.initialized) |
@@ -390,6 +376,20 @@ static bool clean_shutdown(void (*callback)(void *), void *parameter) | |||
390 | dircache_disable(); | 376 | dircache_disable(); |
391 | #endif | 377 | #endif |
392 | 378 | ||
379 | if(global_settings.talk_menu) | ||
380 | { | ||
381 | bool enqueue = false; | ||
382 | if(msg_id != -1) | ||
383 | { | ||
384 | talk_id(msg_id, enqueue); | ||
385 | enqueue = true; | ||
386 | } | ||
387 | talk_id(LANG_SHUTTINGDOWN, enqueue); | ||
388 | #if CONFIG_CODEC == SWCODEC | ||
389 | voice_wait(); | ||
390 | #endif | ||
391 | } | ||
392 | |||
393 | shutdown_hw(); | 393 | shutdown_hw(); |
394 | } | 394 | } |
395 | return false; | 395 | return false; |