From a081964ac8525c3638b1d3dcfbaa54f5a23286f0 Mon Sep 17 00:00:00 2001
From: vk7js <58905135+vk7js@users.noreply.github.com>
Date: Tue, 6 Sep 2022 22:53:31 +1000
Subject: [PATCH] Fixed Backup and Restore menus as follows: 1. Fixed issue of
 voice not reading backup or restore messages but instead stuttering
 indefinitely. 2. Can now press cancel to exit the menu so long as you haven't
 pressed PTT to start the process.

---
 openrtx/src/core/voicePromptUtils.c | 6 ++++++
 openrtx/src/ui/ui.c                 | 5 +++++
 openrtx/src/ui/ui_menu.c            | 5 +----
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/openrtx/src/core/voicePromptUtils.c b/openrtx/src/core/voicePromptUtils.c
index daffce7e..7b52acc0 100644
--- a/openrtx/src/core/voicePromptUtils.c
+++ b/openrtx/src/core/voicePromptUtils.c
@@ -772,6 +772,12 @@ void vp_announceScreen(uint8_t ui_screen)
         vp_announceGPSInfo();
         break;
 #endif //            GPS_PRESENT
+    case MENU_BACKUP:
+        vp_announceBackupScreen();
+        break;
+    case MENU_RESTORE:
+        vp_announceRestoreScreen();
+        break;
     case MENU_ABOUT:
         vp_announceAboutScreen();
         break;
diff --git a/openrtx/src/ui/ui.c b/openrtx/src/ui/ui.c
index 898f7303..dac422ba 100644
--- a/openrtx/src/ui/ui.c
+++ b/openrtx/src/ui/ui.c
@@ -1666,6 +1666,11 @@ void ui_updateFSM(bool *sync_rtx)
                 else if(msg.keys & KEY_ESC)
                     _ui_menuBack(MENU_TOP);
                 break;
+            case MENU_BACKUP:
+            case MENU_RESTORE:
+                if(msg.keys & KEY_ESC)
+                    _ui_menuBack(MENU_TOP);
+                break;
             // Info menu screen
             case MENU_INFO:
                 if(msg.keys & KEY_UP || msg.keys & KNOB_LEFT)
diff --git a/openrtx/src/ui/ui_menu.c b/openrtx/src/ui/ui_menu.c
index 9d607eb5..9b2ecc00 100644
--- a/openrtx/src/ui/ui_menu.c
+++ b/openrtx/src/ui/ui_menu.c
@@ -614,9 +614,7 @@ void _ui_drawMenuBackup(ui_state_t* ui_state)
     gfx_print(line, FONT_SIZE_8PT, TEXT_ALIGN_CENTER,
               color_white, currentLanguage->pressPTTToStart);
 
-    // read this screen.
-    vp_announceBackupScreen();
-    if (!platform_getPttStatus())
+   if (!platform_getPttStatus())
         return;
 
     state.devStatus     = DATATRANSFER;
@@ -642,7 +640,6 @@ void _ui_drawMenuRestore(ui_state_t* ui_state)
     gfx_print(line, FONT_SIZE_8PT, TEXT_ALIGN_CENTER,
               color_white, currentLanguage->pressPTTToStart);
 
-    vp_announceRestoreScreen();
     if (!platform_getPttStatus())
         return;