Unset FocusChat when returning to main menu (#691)

Fixes #403
2020-02-13 06:14:03 -08:00
parent b4b0f6e04b
commit 3292939756
1 changed files with 2 additions and 1 deletions
--- a/Content.Client/GameTicking/ClientGameTicker.cs
+++ b/Content.Client/GameTicking/ClientGameTicker.cs
@@ -92,6 +92,7 @@ namespace Content.Client.GameTicking
        {
            if (e.NewLevel != ClientRunLevel.Initialize)
            {
+                _inputManager.SetInputCommand(ContentKeyFunctions.FocusChat, null);
                return;
            }

@@ -289,7 +290,7 @@ namespace Content.Client.GameTicking

        private void _focusChat(ChatBox chat)
        {
-            if (_userInterfaceManager.KeyboardFocused != null)
+            if (chat == null || _userInterfaceManager.KeyboardFocused != null)
            {
                return;
            }