From 95ff1649631457449bdc580a5a47937718c00e3b Mon Sep 17 00:00:00 2001
From: Sam Wilkins <samwilkins333@gmail.com>
Date: Sun, 4 Aug 2019 05:19:14 -0400
Subject: factored out stop UI code

---
 src/client/util/DictationManager.ts  | 10 ++++++++++
 src/client/views/GlobalKeyHandler.ts |  7 -------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/client/util/DictationManager.ts b/src/client/util/DictationManager.ts
index a882994c1..2af7c53cb 100644
--- a/src/client/util/DictationManager.ts
+++ b/src/client/util/DictationManager.ts
@@ -149,8 +149,18 @@ export namespace DictationManager {
         };
 
         export const stop = (salvageSession = true) => {
+            if (!isListening) {
+                return;
+            }
             isManuallyStopped = true;
             salvageSession ? recognizer.stop() : recognizer.abort();
+            if (MainView.Instance.dictationOverlayVisible) {
+                MainView.Instance.cancelDictationFade();
+                MainView.Instance.dictationOverlayVisible = false;
+                MainView.Instance.isListening = true;
+                MainView.Instance.dictatedPhrase = "";
+                MainView.Instance.dictationSuccess = undefined;
+            }
         };
 
         const synthesize = (e: SpeechRecognitionEvent, delimiter?: string) => {
diff --git a/src/client/views/GlobalKeyHandler.ts b/src/client/views/GlobalKeyHandler.ts
index 0989e8db1..e773014e3 100644
--- a/src/client/views/GlobalKeyHandler.ts
+++ b/src/client/views/GlobalKeyHandler.ts
@@ -72,13 +72,6 @@ export default class KeyManager {
                 main.toggleColorPicker(true);
                 SelectionManager.DeselectAll();
                 DictationManager.Controls.stop();
-                if (main.dictationOverlayVisible) {
-                    main.cancelDictationFade();
-                    main.dictationOverlayVisible = false;
-                    main.isListening = true;
-                    main.dictatedPhrase = "";
-                    main.dictationSuccess = undefined;
-                }
                 break;
             case "delete":
             case "backspace":
-- 
cgit v1.2.3-70-g09d2