Skip to content

Commit

Permalink
Synchronize changes from 1.6 master branch [ci skip]
Browse files Browse the repository at this point in the history
a3c6f0f Fix server compile error introduced in 4d37b6b
639298f Update client en_US pot
  • Loading branch information
github-actions[bot] committed Jan 27, 2024
2 parents 6ec4044 + a3c6f0f commit 86da721
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Server/core/CServerImpl.cpp
Expand Up @@ -480,12 +480,14 @@ void CServerImpl::MainLoop()
if (m_pModManager->IsFinished())
m_bRequestedQuit = true;

#ifdef WIN32
if (g_readyEvent != nullptr && m_pModManager->IsReadyToAcceptConnections())
{
SetEvent(g_readyEvent);
CloseHandle(g_readyEvent);
g_readyEvent = nullptr;
}
#endif

HandlePulseSleep();
}
Expand Down

0 comments on commit 86da721

Please sign in to comment.