Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 07:27:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'acclient_fix' of github.com:jherico/hifi into atp-client

Browse source
This commit is contained in:
Seth Alves 2017-07-05 17:03:16 -07:00
commit d62b0ffb3b
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/shared/src/ThreadHelpers.cpp
View file

@ -17,10 +17,6 @@ void moveToNewNamedThread(QObject* object, const QString& name, std::function<vo
QThread* thread = new QThread(); QThread* thread = new QThread();
thread->setObjectName(name); thread->setObjectName(name);
if (priority != QThread::InheritPriority) {
thread->setPriority(priority);
}
QString tempName = name; QString tempName = name;
QObject::connect(thread, &QThread::started, [startCallback] { QObject::connect(thread, &QThread::started, [startCallback] {
startCallback(); startCallback();
@ -32,6 +28,9 @@ void moveToNewNamedThread(QObject* object, const QString& name, std::function<vo
// put the object on the thread // put the object on the thread
object->moveToThread(thread); object->moveToThread(thread);
thread->start(); thread->start();
if (priority != QThread::InheritPriority) {
thread->setPriority(priority);
}
} }
void moveToNewNamedThread(QObject* object, const QString& name, QThread::Priority priority) { void moveToNewNamedThread(QObject* object, const QString& name, QThread::Priority priority) {

6
tools/ac-client/src/ACClientApp.cpp
View file

@ -106,14 +106,16 @@ ACClientApp::ACClientApp(int argc, char* argv[]) :
auto nodeList = DependencyManager::get<NodeList>(); auto nodeList = DependencyManager::get<NodeList>();
// start the nodeThread so its event loop is running
nodeList->startThread();
// setup a timer for domain-server check ins // setup a timer for domain-server check ins
QTimer* domainCheckInTimer = new QTimer(nodeList.data()); QTimer* domainCheckInTimer = new QTimer(nodeList.data());
connect(domainCheckInTimer, &QTimer::timeout, nodeList.data(), &NodeList::sendDomainServerCheckIn); connect(domainCheckInTimer, &QTimer::timeout, nodeList.data(), &NodeList::sendDomainServerCheckIn);
domainCheckInTimer->start(DOMAIN_SERVER_CHECK_IN_MSECS); domainCheckInTimer->start(DOMAIN_SERVER_CHECK_IN_MSECS);
// start the nodeThread so its event loop is running
// (must happen after the checkin timer is created with the nodelist as it's parent)
nodeList->startThread();
const DomainHandler& domainHandler = nodeList->getDomainHandler(); const DomainHandler& domainHandler = nodeList->getDomainHandler();
connect(&domainHandler, SIGNAL(hostnameChanged(const QString&)), SLOT(domainChanged(const QString&))); connect(&domainHandler, SIGNAL(hostnameChanged(const QString&)), SLOT(domainChanged(const QString&)));