From df3bfafce6a0fb6396e1ec50fdfae3b16cb05c27 Mon Sep 17 00:00:00 2001
From: Amos <48657826+Mauler125@users.noreply.github.com>
Date: Wed, 19 Jan 2022 23:46:14 +0100
Subject: [PATCH] Register ConCommands as early as possible

---
 r5dev/client/cdll_engine_int.cpp | 2 --
 r5dev/engine/host_state.cpp      | 2 --
 r5dev/launcher/IApplication.cpp  | 2 ++
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/r5dev/client/cdll_engine_int.cpp b/r5dev/client/cdll_engine_int.cpp
index bc0c1041..1f89b967 100644
--- a/r5dev/client/cdll_engine_int.cpp
+++ b/r5dev/client/cdll_engine_int.cpp
@@ -27,8 +27,6 @@ void __fastcall HFrameStageNotify(CHLClient* rcx, ClientFrameStage_t frameStage)
 #ifdef GAMEDLL_S3
 				g_pConVar->ClearHostNames();
 #endif // GAMEDLL_S3
-
-				g_pConCommand->Init();
 				CKeyValueSystem_Init();
 
 				if (!g_pCmdLine->CheckParm("-devsdk"))
diff --git a/r5dev/engine/host_state.cpp b/r5dev/engine/host_state.cpp
index 468f3333..a55805b7 100644
--- a/r5dev/engine/host_state.cpp
+++ b/r5dev/engine/host_state.cpp
@@ -130,10 +130,8 @@ void HCHostState_FrameUpdate(void* rcx, void* rdx, float time)
 	static bool bInitialized = false;
 	if (!bInitialized)
 	{
-		g_pConCommand->Init();
 		g_pConVar->ClearHostNames();
 
-
 		if (!g_pCmdLine->CheckParm("-devsdk"))
 		{
 			IVEngineClient_CommandExecute(NULL, "exec autoexec.cfg");
diff --git a/r5dev/launcher/IApplication.cpp b/r5dev/launcher/IApplication.cpp
index 7e1f98b3..f8eb972e 100644
--- a/r5dev/launcher/IApplication.cpp
+++ b/r5dev/launcher/IApplication.cpp
@@ -22,6 +22,8 @@ bool HIApplication_Create(void* a1)
 	// Also add cross-season support?
 	* (uintptr_t*)0x162C61208 = 0x1; // g_bDedicated
 #endif // DEDICATED
+	g_pConCommand->Init();
+
 	for (auto& map : g_pCVar->DumpToMap())
 	{
 		g_vsvAllConVars.push_back(map.first.c_str());