From d8ce37e0c90a3da2d42a09d33523e4403aab2723 Mon Sep 17 00:00:00 2001 From: Wyrserth <43747507+Wyrserth@users.noreply.github.com> Date: Sun, 26 May 2019 23:01:50 +0200 Subject: Core/Console: start CliRunnable thread after all log messages have been printed. (#23321) --- src/server/worldserver/Main.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/server/worldserver/Main.cpp') diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp index 335b553a018..e163dd2566d 100644 --- a/src/server/worldserver/Main.cpp +++ b/src/server/worldserver/Main.cpp @@ -307,17 +307,6 @@ extern int main(int argc, char** argv) ClearOnlineAccounts(); }); - // Launch CliRunnable thread - std::shared_ptr cliThread; -#ifdef _WIN32 - if (sConfigMgr->GetBoolDefault("Console.Enable", true) && (m_ServiceStatus == -1)/* need disable console in service mode*/) -#else - if (sConfigMgr->GetBoolDefault("Console.Enable", true)) -#endif - { - cliThread.reset(new std::thread(CliThread), &ShutdownCLIThread); - } - // Set server online (allow connecting now) LoginDatabase.DirectPExecute("UPDATE realmlist SET flag = flag & ~%u, population = 0 WHERE id = '%u'", REALM_FLAG_OFFLINE, realm.Id.Realm); realm.PopulationLevel = 0.0f; @@ -336,6 +325,17 @@ extern int main(int argc, char** argv) sScriptMgr->OnStartup(); + // Launch CliRunnable thread + std::shared_ptr cliThread; +#ifdef _WIN32 + if (sConfigMgr->GetBoolDefault("Console.Enable", true) && (m_ServiceStatus == -1)/* need disable console in service mode*/) +#else + if (sConfigMgr->GetBoolDefault("Console.Enable", true)) +#endif + { + cliThread.reset(new std::thread(CliThread), &ShutdownCLIThread); + } + WorldUpdateLoop(); // Shutdown starts here -- cgit v1.2.3