don't handle octree query while server shutting down

This commit is contained in:
Stephen Birarda 2015-07-16 14:42:16 -07:00
parent d04c2e4a78
commit 010cbd9934

View file

@ -813,14 +813,16 @@ void OctreeServer::parsePayload() {
} }
void OctreeServer::handleOctreeQueryPacket(QSharedPointer<NLPacket> packet, SharedNodePointer senderNode) { void OctreeServer::handleOctreeQueryPacket(QSharedPointer<NLPacket> packet, SharedNodePointer senderNode) {
// If we got a query packet, then we're talking to an agent, and we if (!_isFinished) {
// need to make sure we have it in our nodeList. // If we got a query packet, then we're talking to an agent, and we
auto nodeList = DependencyManager::get<NodeList>(); // need to make sure we have it in our nodeList.
nodeList->updateNodeWithDataFromPacket(packet, senderNode); auto nodeList = DependencyManager::get<NodeList>();
nodeList->updateNodeWithDataFromPacket(packet, senderNode);
OctreeQueryNode* nodeData = dynamic_cast<OctreeQueryNode*>(senderNode->getLinkedData());
if (nodeData && !nodeData->isOctreeSendThreadInitalized()) { OctreeQueryNode* nodeData = dynamic_cast<OctreeQueryNode*>(senderNode->getLinkedData());
nodeData->initializeOctreeSendThread(this, senderNode); if (nodeData && !nodeData->isOctreeSendThreadInitalized()) {
nodeData->initializeOctreeSendThread(this, senderNode);
}
} }
} }