From 51ec7ae2edbce416fd4c0bf477deec94eff46c28 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Tue, 15 Dec 2015 16:51:28 -0800 Subject: [PATCH] Keep UUID of node in send thread --- assignment-client/src/octree/OctreeSendThread.cpp | 5 +++-- assignment-client/src/octree/OctreeSendThread.h | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/assignment-client/src/octree/OctreeSendThread.cpp b/assignment-client/src/octree/OctreeSendThread.cpp index 6215712c6c..2ff06c7439 100644 --- a/assignment-client/src/octree/OctreeSendThread.cpp +++ b/assignment-client/src/octree/OctreeSendThread.cpp @@ -25,12 +25,13 @@ quint64 endSceneSleepTime = 0; OctreeSendThread::OctreeSendThread(OctreeServer* myServer, const SharedNodePointer& node) : _myServer(myServer), - _node(node) + _node(node), + _nodeUuid(node->getUUID()) { QString safeServerName("Octree"); // set our QThread object name so we can identify this thread while debugging - setObjectName(QString("Octree Send Thread (%1)").arg(uuidStringWithoutCurlyBraces(node->getUUID()))); + setObjectName(QString("Octree Send Thread (%1)").arg(uuidStringWithoutCurlyBraces(_nodeUuid))); if (_myServer) { safeServerName = _myServer->getMyServerName(); diff --git a/assignment-client/src/octree/OctreeSendThread.h b/assignment-client/src/octree/OctreeSendThread.h index e3c47343b0..c77a327e70 100644 --- a/assignment-client/src/octree/OctreeSendThread.h +++ b/assignment-client/src/octree/OctreeSendThread.h @@ -31,6 +31,7 @@ public: virtual ~OctreeSendThread(); void setIsShuttingDown(); + QUuid getNodeUuid() const { return _nodeUuid; } static AtomicUIntStat _totalBytes; static AtomicUIntStat _totalWastedBytes; @@ -53,6 +54,7 @@ private: OctreeServer* _myServer { nullptr }; QWeakPointer _node; + QUuid _nodeUuid; OctreePacketData _packetData;