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

Merge pull request #6559 from birarda/log-handler-crash

Browse source 
reset the NodeList on its own thread
This commit is contained in:
Brad Hefta-Gaub 2015-12-04 11:44:06 -08:00
commit 84b98c93a1
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/networking/src/DomainHandler.cpp
View file

@ -94,7 +94,7 @@ void DomainHandler::softReset() {
clearSettings(); clearSettings();
// cancel the failure timeout for any pending requests for settings // cancel the failure timeout for any pending requests for settings
QMetaObject::invokeMethod(&_settingsTimer, "stop", Qt::AutoConnection); QMetaObject::invokeMethod(&_settingsTimer, "stop");
} }
void DomainHandler::hardReset() { void DomainHandler::hardReset() {

5
libraries/networking/src/NodeList.cpp
View file

@ -200,6 +200,11 @@ void NodeList::processICEPingPacket(QSharedPointer<NLPacket> packet) {
} }
void NodeList::reset() { void NodeList::reset() {
if (thread() != QThread::currentThread()) {
QMetaObject::invokeMethod(this, "reset", Qt::BlockingQueuedConnection);
return;
}
LimitedNodeList::reset(); LimitedNodeList::reset();
_numNoReplyDomainCheckIns = 0; _numNoReplyDomainCheckIns = 0;