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

take down AssetClient after content manager

Browse source
This commit is contained in:
Stephen Birarda 2018-02-16 10:58:32 -08:00
parent 5dec3aba50
commit 494f93304b
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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