From 62e541e21b5675039283a515d9b1bba02b62e432 Mon Sep 17 00:00:00 2001
From: Sam Wilkins <samwilkins333@gmail.com>
Date: Sun, 4 Aug 2019 03:18:51 -0400
Subject: handled all edge cases for continuous recording

---
 src/client/views/ContextMenuItem.tsx | 2 +-
 src/client/views/GlobalKeyHandler.ts | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/client/views')

diff --git a/src/client/views/ContextMenuItem.tsx b/src/client/views/ContextMenuItem.tsx
index a1787e78f..90f7be33f 100644
--- a/src/client/views/ContextMenuItem.tsx
+++ b/src/client/views/ContextMenuItem.tsx
@@ -39,13 +39,13 @@ export class ContextMenuItem extends React.Component<ContextMenuProps & { select
 
     handleEvent = async (e: React.MouseEvent<HTMLDivElement>) => {
         if ("event" in this.props) {
+            this.props.closeMenu && this.props.closeMenu();
             let batch: UndoManager.Batch | undefined;
             if (this.props.undoable !== false) {
                 batch = UndoManager.StartBatch(`Context menu event: ${this.props.description}`);
             }
             await this.props.event();
             batch && batch.end();
-            this.props.closeMenu && this.props.closeMenu();
         }
     }
 
diff --git a/src/client/views/GlobalKeyHandler.ts b/src/client/views/GlobalKeyHandler.ts
index 98df43a1e..c3e6ae6c8 100644
--- a/src/client/views/GlobalKeyHandler.ts
+++ b/src/client/views/GlobalKeyHandler.ts
@@ -72,9 +72,11 @@ export default class KeyManager {
                 main.toggleColorPicker(true);
                 SelectionManager.DeselectAll();
                 DictationManager.Controls.stop();
-                main.dictationOverlayVisible = false;
-                main.dictationSuccess = undefined;
-                main.cancelDictationFade();
+                if (main.dictationOverlayVisible) {
+                    main.dictationOverlayVisible = false;
+                    main.dictationSuccess = undefined;
+                    main.cancelDictationFade();
+                }
                 break;
             case "delete":
             case "backspace":
-- 
cgit v1.2.3-70-g09d2