From 3292939756271538b8f50f6ec1d97a9514bc6350 Mon Sep 17 00:00:00 2001
From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Date: Thu, 13 Feb 2020 06:14:03 -0800
Subject: [PATCH] Unset FocusChat when returning to main menu (#691)

Fixes #403
---
 Content.Client/GameTicking/ClientGameTicker.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Content.Client/GameTicking/ClientGameTicker.cs b/Content.Client/GameTicking/ClientGameTicker.cs
index b5367518b1..18210f44eb 100644
--- 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;
             }