From 806e95b38232865ad5759b6fe3d681f52f982de8 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Mon, 15 Jul 2019 18:57:17 +0200
Subject: [PATCH] Fix connecting to a server with the lobby enabled.

---
 Content.Client/EntryPoint.cs                   | 2 +-
 Content.Client/GameTicking/ClientGameTicker.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Client/EntryPoint.cs b/Content.Client/EntryPoint.cs
index 86a9e5837f..88385112c6 100644
--- a/Content.Client/EntryPoint.cs
+++ b/Content.Client/EntryPoint.cs
@@ -195,11 +195,11 @@ namespace Content.Client
             var inputMan = IoCManager.Resolve<IInputManager>();
             ContentContexts.SetupContexts(inputMan.Contexts);
 
+            IoCManager.Resolve<IGameHud>().Initialize();
             IoCManager.Resolve<IClientNotifyManager>().Initialize();
             IoCManager.Resolve<IClientGameTicker>().Initialize();
             IoCManager.Resolve<IOverlayManager>().AddOverlay(new ParallaxOverlay());
             IoCManager.Resolve<IChatManager>().Initialize();
-            IoCManager.Resolve<IGameHud>().Initialize();
         }
 
         public override void Update(ModUpdateLevel level, float frameTime)
diff --git a/Content.Client/GameTicking/ClientGameTicker.cs b/Content.Client/GameTicking/ClientGameTicker.cs
index a89611e48a..4ffa820e50 100644
--- a/Content.Client/GameTicking/ClientGameTicker.cs
+++ b/Content.Client/GameTicking/ClientGameTicker.cs
@@ -178,7 +178,7 @@ namespace Content.Client.GameTicking
                 _tutorialButton = null;
             }
 
-            _gameHud.RootControl?.Parent.RemoveChild(_gameHud.RootControl);
+            _gameHud.RootControl.Parent?.RemoveChild(_gameHud.RootControl);
 
             _tickerState = TickerState.InLobby;