From 28e9f168d4de3cc1aa6e36bdef9eeeae470f091f Mon Sep 17 00:00:00 2001
From: DoctorNefario <5243039+DoctorNefario@users.noreply.github.com>
Date: Tue, 13 Apr 2021 19:16:48 +1000
Subject: [PATCH] Disable forwarding the Escape event (#10697)

---
 .../colorPicker/ColorPickerUI/Helpers/AppStateHandler.cs    | 6 +++++-
 .../colorPicker/ColorPickerUI/Keyboard/KeyboardMonitor.cs   | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/modules/colorPicker/ColorPickerUI/Helpers/AppStateHandler.cs b/src/modules/colorPicker/ColorPickerUI/Helpers/AppStateHandler.cs
index 2b303cb663..236c4fbfb0 100644
--- a/src/modules/colorPicker/ColorPickerUI/Helpers/AppStateHandler.cs
+++ b/src/modules/colorPicker/ColorPickerUI/Helpers/AppStateHandler.cs
@@ -54,7 +54,7 @@ namespace ColorPicker.Helpers
             }
         }
 
-        public void EndUserSession()
+        public bool EndUserSession()
         {
             lock (_colorPickerVisibilityLock)
             {
@@ -70,7 +70,11 @@ namespace ColorPicker.Helpers
                     }
 
                     SessionEventHelper.End();
+
+                    return true;
                 }
+
+                return false;
             }
         }
 
diff --git a/src/modules/colorPicker/ColorPickerUI/Keyboard/KeyboardMonitor.cs b/src/modules/colorPicker/ColorPickerUI/Keyboard/KeyboardMonitor.cs
index f18f9acb02..d96b1c49c7 100644
--- a/src/modules/colorPicker/ColorPickerUI/Keyboard/KeyboardMonitor.cs
+++ b/src/modules/colorPicker/ColorPickerUI/Keyboard/KeyboardMonitor.cs
@@ -72,7 +72,7 @@ namespace ColorPicker.Keyboard
             // ESC pressed
             if (virtualCode == KeyInterop.VirtualKeyFromKey(Key.Escape))
             {
-                _appStateHandler.EndUserSession();
+                e.Handled = _appStateHandler.EndUserSession();
                 return;
             }