Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 19:52:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

cleanup LNL last during DS shutdown

Browse source
This commit is contained in:
Stephen Birarda 2018-02-16 11:01:22 -08:00
parent 494f93304b
commit 441b55301f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
domain-server/src/DomainServer.cpp
View file

@ -380,9 +380,6 @@ void DomainServer::parseCommandLine() {
DomainServer::~DomainServer() { DomainServer::~DomainServer() {
qInfo() << "Domain Server is shutting down."; qInfo() << "Domain Server is shutting down.";
// destroy the LimitedNodeList before the DomainServer QCoreApplication is down
DependencyManager::destroy<LimitedNodeList>();
if (_contentManager) { if (_contentManager) {
_contentManager->aboutToFinish(); _contentManager->aboutToFinish();
_contentManager->terminate(); _contentManager->terminate();
@ -392,6 +389,9 @@ DomainServer::~DomainServer() {
DependencyManager::destroy<AssetClient>(); DependencyManager::destroy<AssetClient>();
_assetClientThread.quit(); _assetClientThread.quit();
_assetClientThread.wait(); _assetClientThread.wait();
// destroy the LimitedNodeList before the DomainServer QCoreApplication is down
DependencyManager::destroy<LimitedNodeList>();
} }
void DomainServer::queuedQuit(QString quitMessage, int exitCode) { void DomainServer::queuedQuit(QString quitMessage, int exitCode) {