From 010cbd9934ba2dd4cb99ebe7faff5193a6c4b3e8 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 16 Jul 2015 14:42:16 -0700 Subject: [PATCH] don't handle octree query while server shutting down --- assignment-client/src/octree/OctreeServer.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/assignment-client/src/octree/OctreeServer.cpp b/assignment-client/src/octree/OctreeServer.cpp index 1cd59d804f..f493decae9 100644 --- a/assignment-client/src/octree/OctreeServer.cpp +++ b/assignment-client/src/octree/OctreeServer.cpp @@ -813,14 +813,16 @@ void OctreeServer::parsePayload() { } void OctreeServer::handleOctreeQueryPacket(QSharedPointer packet, SharedNodePointer senderNode) { - // If we got a query packet, then we're talking to an agent, and we - // need to make sure we have it in our nodeList. - auto nodeList = DependencyManager::get(); - nodeList->updateNodeWithDataFromPacket(packet, senderNode); - - OctreeQueryNode* nodeData = dynamic_cast(senderNode->getLinkedData()); - if (nodeData && !nodeData->isOctreeSendThreadInitalized()) { - nodeData->initializeOctreeSendThread(this, senderNode); + if (!_isFinished) { + // If we got a query packet, then we're talking to an agent, and we + // need to make sure we have it in our nodeList. + auto nodeList = DependencyManager::get(); + nodeList->updateNodeWithDataFromPacket(packet, senderNode); + + OctreeQueryNode* nodeData = dynamic_cast(senderNode->getLinkedData()); + if (nodeData && !nodeData->isOctreeSendThreadInitalized()) { + nodeData->initializeOctreeSendThread(this, senderNode); + } } }