From 67294d3a23ac3a7c1a8fb88c235cf16d4e829a20 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 22 Jul 2015 13:55:22 -0700 Subject: [PATCH] rename nodesToKill to nodesToShutdown --- assignment-client/src/octree/OctreeServer.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/assignment-client/src/octree/OctreeServer.cpp b/assignment-client/src/octree/OctreeServer.cpp index c018d65f98..76d701f0e3 100644 --- a/assignment-client/src/octree/OctreeServer.cpp +++ b/assignment-client/src/octree/OctreeServer.cpp @@ -1176,18 +1176,18 @@ void OctreeServer::aboutToFinish() { _jurisdictionSender->terminating(); } - QSet nodesToKill; + QSet nodesToShutdown; // Force a shutdown of all of our OctreeSendThreads. // At this point it has to be impossible for a linkedDataCreateCallback to be called for a new node - nodeList->eachNode([&nodesToKill](const SharedNodePointer& node) { - nodesToKill << node; + nodeList->eachNode([&nodesToShutdown](const SharedNodePointer& node) { + nodesToShutdown << node; }); // What follows is a hack to force OctreeSendThreads to cleanup before the OctreeServer is gone. // I would prefer to allow the SharedNodePointer ref count drop to zero to do this automatically // but that isn't possible as long as the OctreeSendThread has an OctreeServer* that it uses. - for (auto& node : nodesToKill) { + for (auto& node : nodesToShutdown) { qDebug() << qPrintable(_safeServerName) << "server about to finish while node still connected node:" << *node; forceNodeShutdown(node); }