Do not deadlock in Stop if invoked

gui-cs · Dec 14, 2024 · 293fe4e · 293fe4e
1 parent e832d61
commit 293fe4e
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 3 deletions.
diff --git a/Terminal.Gui/ConsoleDrivers/V2/MainLoopCoordinator.cs b/Terminal.Gui/ConsoleDrivers/V2/MainLoopCoordinator.cs
@@ -110,7 +110,16 @@ public void Stop ()
     {
         tokenSource.Cancel();
 
-        // Wait for both tasks to complete
-        Task.WhenAll (_inputTask, _loopTask).Wait ();
+        if (_loopTask.Id == Task.CurrentId)
+        {
+            // Cannot wait for loop to finish because we are actively executing on that thread
+            Task.WhenAll (_inputTask).Wait ();
+        }
+        else
+        {
+            // Wait for both tasks to complete
+            Task.WhenAll (_inputTask, _loopTask).Wait ();
+        }
+
     }
 }
diff --git a/Terminal.Gui/ConsoleDrivers/V2/WindowsInputProcessor.cs b/Terminal.Gui/ConsoleDrivers/V2/WindowsInputProcessor.cs
@@ -68,7 +68,49 @@ protected override void Process (InputRecord inputEvent)
     /// <inheritdoc />
     protected override void ProcessAfterParsing (InputRecord input)
     {
-        var key = (Key)input.KeyEvent.UnicodeChar;
+        Key key;
+        if (input.KeyEvent.UnicodeChar == '\0')
+        {
+            key = input.KeyEvent.wVirtualKeyCode switch
+                  {
+                      VK.DOWN => Key.CursorDown,
+                      VK.UP => Key.CursorUp,
+                      VK.LEFT => Key.CursorLeft,
+                      VK.RIGHT => Key.CursorRight,
+                      VK.BACK => Key.Backspace,
+                      VK.TAB => Key.Tab,
+                      VK.F1 => Key.F1,
+                      VK.F2 => Key.F2,
+                      VK.F3 => Key.F3,
+                      VK.F4 => Key.F4,
+                      VK.F5 => Key.F5,
+                      VK.F6 => Key.F6,
+                      VK.F7 => Key.F7,
+                      VK.F8 => Key.F8,
+                      VK.F9 => Key.F9,
+                      VK.F10 => Key.F10,
+                      VK.F11 => Key.F11,
+                      VK.F12 => Key.F12,
+                      VK.F13 => Key.F13,
+                      VK.F14 => Key.F14,
+                      VK.F15 => Key.F15,
+                      VK.F16 => Key.F16,
+                      VK.F17 => Key.F17,
+                      VK.F18 => Key.F18,
+                      VK.F19 => Key.F19,
+                      VK.F20 => Key.F20,
+                      VK.F21 => Key.F21,
+                      VK.F22 => Key.F22,
+                      VK.F23 => Key.F23,
+                      VK.F24 => Key.F24,
+                      _ => (Key)'\0'
+                  };
+        }
+        else
+        {
+            key = input.KeyEvent.UnicodeChar;
+        }
+
         OnKeyDown (key);
         OnKeyUp (key);
     }

diff --git a/UICatalog/UICatalog.cs b/UICatalog/UICatalog.cs
@@ -908,6 +908,12 @@ public UICatalogTopLevel ()
 
         public void ConfigChanged ()
         {
+            if (MenuBar == null)
+            {
+                // View is probably disposed
+                return;
+            }
+
             if (_topLevelColorScheme == null || !Colors.ColorSchemes.ContainsKey (_topLevelColorScheme))
             {
                 _topLevelColorScheme = "Base";