History

Merge pull request #10799 from jherico/object_parent_warnings

Fix warnings about creating QObjects with parents in different thread

Seth Alves committed 9 years ago

Commit 2f2a13e2 parents 9ae3908 416852c3 files · +10 −6Browse files

Showing the changes to interface/src/Application.cpp (1 of 3 files). Show all

Unified · Split

interface/src/Application.cpp+5−1
@@ -723,9 +723,13 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 722 unmodified lines
723 updateHeartbeat();723 updateHeartbeat();
724 724
725 // setup a timer for domain-server check ins725 // setup a timer for domain-server check ins
726 QTimer* domainCheckInTimer = new QTimer(nodeList.data());726 QTimer* domainCheckInTimer = new QTimer(this);
727 connect(domainCheckInTimer, &QTimer::timeout, nodeList.data(), &NodeList::sendDomainServerCheckIn);727 connect(domainCheckInTimer, &QTimer::timeout, nodeList.data(), &NodeList::sendDomainServerCheckIn);
728 domainCheckInTimer->start(DOMAIN_SERVER_CHECK_IN_MSECS);728 domainCheckInTimer->start(DOMAIN_SERVER_CHECK_IN_MSECS);
729 connect(this, &QCoreApplication::aboutToQuit, [domainCheckInTimer] {
730 domainCheckInTimer->stop();
731 domainCheckInTimer->deleteLater();
732 });
729 733
730 734
731 auto audioIO = DependencyManager::get<AudioClient>();735 auto audioIO = DependencyManager::get<AudioClient>();