edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-13 03:28:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #2436

Browse source 
2436: Revert "Don't run UpdateServerInfo if server isn't initialized yet" r=Learath2 a=heinrich5991

This reverts commit e69f747e5f.

Fixes `shutdown` on the initial command line which is also used on CI.

Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
This commit is contained in:
bors[bot] 2020-07-01 15:54:14 +00:00 committed by GitHub
parent 1fbd847edd 358735aadb
commit 2a36219987
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/engine/server/server.cpp
View file

@ -273,7 +273,7 @@ CServer::CServer(): m_Register(false), m_RegSixup(true)
m_pGameServer = 0; m_pGameServer = 0;
m_CurrentGameTick = 0; m_CurrentGameTick = 0;
m_RunServer = false; m_RunServer = 1;
for(int i = 0; i < 2; i++) for(int i = 0; i < 2; i++)
{ {
@ -2075,9 +2075,6 @@ void CServer::ExpireServerInfo()
void CServer::UpdateServerInfo(bool Resend) void CServer::UpdateServerInfo(bool Resend)
{ {
if(!m_RunServer)
return;
for(int i = 0; i < 3; i++) for(int i = 0; i < 3; i++)
for(int j = 0; j < 2; j++) for(int j = 0; j < 2; j++)
CacheServerInfo(&m_ServerInfoCache[i * 2 + j], i, j); CacheServerInfo(&m_ServerInfoCache[i * 2 + j], i, j);
@ -2295,8 +2292,6 @@ void CServer::InitRegister(CNetServer *pNetServer, IEngineMasterServer *pMasterS
int CServer::Run() int CServer::Run()
{ {
m_RunServer = true;
m_AuthManager.Init(); m_AuthManager.Init();
if(g_Config.m_Debug) if(g_Config.m_Debug)