From e69f747e5fc00ec19add95946055c7288ececb91 Mon Sep 17 00:00:00 2001 From: def Date: Tue, 30 Jun 2020 17:32:27 +0200 Subject: [PATCH] Don't run UpdateServerInfo if server isn't initialized yet or currently shutting down anyway. Fixes the first half of #2421 --- src/engine/server/server.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp index ea222886a..61b200b37 100644 --- a/src/engine/server/server.cpp +++ b/src/engine/server/server.cpp @@ -273,7 +273,7 @@ CServer::CServer(): m_Register(false), m_RegSixup(true) m_pGameServer = 0; m_CurrentGameTick = 0; - m_RunServer = 1; + m_RunServer = false; for(int i = 0; i < 2; i++) { @@ -2075,6 +2075,9 @@ void CServer::ExpireServerInfo() void CServer::UpdateServerInfo(bool Resend) { + if(!m_RunServer) + return; + for(int i = 0; i < 3; i++) for(int j = 0; j < 2; j++) CacheServerInfo(&m_ServerInfoCache[i * 2 + j], i, j); @@ -2292,6 +2295,8 @@ void CServer::InitRegister(CNetServer *pNetServer, IEngineMasterServer *pMasterS int CServer::Run() { + m_RunServer = true; + m_AuthManager.Init(); if(g_Config.m_Debug)