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

Merge pull request #16233 from Atlante45/fix/flush-timer

Browse source 
Put flush timer on right thread without parenting
This commit is contained in:
Shannon Romano 2019-09-23 09:37:05 -07:00 committed by GitHub
commit 68c37e561a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/AssignmentClientApp.cpp
View file

@ -240,7 +240,7 @@ AssignmentClientApp::AssignmentClientApp(int argc, char* argv[]) :
QThread::currentThread()->setObjectName("main thread"); QThread::currentThread()->setObjectName("main thread");
LogHandler::getInstance().setParent(this); LogHandler::getInstance().moveToThread(thread());
LogHandler::getInstance().setupRepeatedMessageFlusher(); LogHandler::getInstance().setupRepeatedMessageFlusher();
DependencyManager::registerInheritance<LimitedNodeList, NodeList>(); DependencyManager::registerInheritance<LimitedNodeList, NodeList>();

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

@ -174,7 +174,7 @@ DomainServer::DomainServer(int argc, char* argv[]) :
LogUtils::init(); LogUtils::init();
LogHandler::getInstance().setParent(this); LogHandler::getInstance().moveToThread(thread());
LogHandler::getInstance().setupRepeatedMessageFlusher(); LogHandler::getInstance().setupRepeatedMessageFlusher();
qDebug() << "Setting up domain-server"; qDebug() << "Setting up domain-server";

2
interface/src/Application.cpp
View file

@ -1062,7 +1062,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
setProperty(hifi::properties::STEAM, (steamClient && steamClient->isRunning())); setProperty(hifi::properties::STEAM, (steamClient && steamClient->isRunning()));
setProperty(hifi::properties::CRASHED, _previousSessionCrashed); setProperty(hifi::properties::CRASHED, _previousSessionCrashed);
LogHandler::getInstance().setParent(this); LogHandler::getInstance().moveToThread(thread());
LogHandler::getInstance().setupRepeatedMessageFlusher(); LogHandler::getInstance().setupRepeatedMessageFlusher();
{ {