2f107db...5202af9

Barotrauma/BarotraumaClient/Source/EventInput/EventInput.cs

@@ -178,11 +178,12 @@ namespace EventInput
         private static void ReceiveInput(object sender, TextInputEventArgs e)
         {
             OnCharEntered(e.Character);
+            KeyDown?.Invoke(sender, new KeyEventArgs(e.Key));
         }
 
         public static void OnCharEntered(char character)
         {
-            if (CharEntered != null) CharEntered(null, new CharacterEventArgs(character, 0));
+            CharEntered?.Invoke(null, new CharacterEventArgs(character, 0));
         }
 #if WINDOWS
         static IntPtr HookProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam)

Barotrauma/BarotraumaClient/Source/EventInput/KeyboardDispatcher.cs

@@ -27,7 +27,7 @@ namespace EventInput
             EventInput.KeyDown += EventInput_KeyDown;
         }
 
-        void EventInput_KeyDown(object sender, KeyEventArgs e)
+        public void EventInput_KeyDown(object sender, KeyEventArgs e)
         {
             if (_subscriber == null)
                 return;
@@ -74,6 +74,7 @@ namespace EventInput
             get { return _subscriber; }
             set
             {
+                if (_subscriber == value) return;
                 if (_subscriber != null)
                     _subscriber.Selected = false;
                 _subscriber = value;