From 75f74814c00383de4fc7b134a26fd10ee2eb8486 Mon Sep 17 00:00:00 2001
From: Solomon Peachy <pizza@shaftnet.org>
Date: Sat, 8 Dec 2018 20:06:55 -0500
Subject: Voice:  Don't omit "shutting down" speech warning when battery dies.

(Taken from Igor Poretsky's tree)

Change-Id: I0fee8346e857eeaea5059360c0f35bd6a2e98b97
---
 apps/misc.c | 28 ++++++++++++++--------------
 1 file 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)
 #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;
-- 
cgit v1.2.3