diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp index f6d36a6023..b3862e4252 100644 --- a/libraries/networking/src/NodeList.cpp +++ b/libraries/networking/src/NodeList.cpp @@ -292,6 +292,13 @@ void NodeList::addSetOfNodeTypesToNodeInterestSet(const NodeSet& setOfNodeTypes) void NodeList::sendDomainServerCheckIn() { + // On ThreadedAssignments (assignment clients), this function + // is called by the server check-in timer thread + // not the NodeList thread. Calling it on the NodeList thread + // resulted in starvation of the server check-in function. + // be VERY CAREFUL modifying this code as members of NodeList + // may be called by multiple threads. + if (!_sendDomainServerCheckInEnabled) { qCDebug(networking_ice) << "Refusing to send a domain-server check in while it is disabled."; return;