From 1ca30b688db83fa616b1de0e4954235bf71e0d86 Mon Sep 17 00:00:00 2001 From: Clement Date: Fri, 20 Sep 2019 15:39:35 -0700 Subject: [PATCH] Put flush timer on right thread without parenting --- assignment-client/src/AssignmentClientApp.cpp | 2 +- domain-server/src/DomainServer.cpp | 2 +- interface/src/Application.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assignment-client/src/AssignmentClientApp.cpp b/assignment-client/src/AssignmentClientApp.cpp index 162f18f712..c5b228bd16 100644 --- a/assignment-client/src/AssignmentClientApp.cpp +++ b/assignment-client/src/AssignmentClientApp.cpp @@ -240,7 +240,7 @@ AssignmentClientApp::AssignmentClientApp(int argc, char* argv[]) : QThread::currentThread()->setObjectName("main thread"); - LogHandler::getInstance().setParent(this); + LogHandler::getInstance().moveToThread(thread()); LogHandler::getInstance().setupRepeatedMessageFlusher(); DependencyManager::registerInheritance(); diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index bad553c65e..de2382e647 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -174,7 +174,7 @@ DomainServer::DomainServer(int argc, char* argv[]) : LogUtils::init(); - LogHandler::getInstance().setParent(this); + LogHandler::getInstance().moveToThread(thread()); LogHandler::getInstance().setupRepeatedMessageFlusher(); qDebug() << "Setting up domain-server"; diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 0863a999bd..ef3aafef4f 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1062,7 +1062,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo setProperty(hifi::properties::STEAM, (steamClient && steamClient->isRunning())); setProperty(hifi::properties::CRASHED, _previousSessionCrashed); - LogHandler::getInstance().setParent(this); + LogHandler::getInstance().moveToThread(thread()); LogHandler::getInstance().setupRepeatedMessageFlusher(); {