From e48a98bcf414b21dc671203db05fb6c1c1592777 Mon Sep 17 00:00:00 2001
From: Adam Johnson <AdamJohnso@gmail.com>
Date: Fri, 31 Jul 2015 16:07:03 -0400
Subject: [PATCH] Ensure the net client doesn't do evil stuff before we're
 launched

---
 Sources/Plasma/Apps/plClient/plClient.cpp                | 3 ++-
 Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Sources/Plasma/Apps/plClient/plClient.cpp b/Sources/Plasma/Apps/plClient/plClient.cpp
index 49cc921b..f134e84a 100644
--- a/Sources/Plasma/Apps/plClient/plClient.cpp
+++ b/Sources/Plasma/Apps/plClient/plClient.cpp
@@ -1427,7 +1427,7 @@ bool plClient::StartInit()
     //
     // Init Net before loading things
     //
-    plNetClientMgr::GetInstance()->Init();
+    plNetClientMgr::GetInstance()->RegisterAs(kNetClientMgr_KEY);
     plAgeLoader::GetInstance()->Init();
 
     plCmdIfaceModMsg* pModMsg2 = new plCmdIfaceModMsg;
@@ -1463,6 +1463,7 @@ bool plClient::StartInit()
 //============================================================================
 bool plClient::BeginGame()
 {
+    plNetClientMgr::GetInstance()->Init();
     IPlayIntroMovie("avi/CyanWorlds.webm", 0.f, 0.f, 0.f, 1.f, 1.f, 0.75);
     if (GetDone()) return false;
     IPatchGlobalAgeFiles();
diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp
index 63509817..16e22721 100644
--- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp
+++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp
@@ -341,7 +341,6 @@ int plNetClientMgr::Init()
 
     VaultInitialize();
 
-    RegisterAs( kNetClientMgr_KEY );
     IAddCloneRoom();
 
     fNetGroups.Reset();