From cd6e0f16982b65d9b9532956a0d3ad73d8a58431 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Wed, 19 Mar 2014 01:02:49 -0700 Subject: [PATCH] switch to deleteLater to prevent deadlock --- assignment-client/src/octree/OctreeServer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assignment-client/src/octree/OctreeServer.cpp b/assignment-client/src/octree/OctreeServer.cpp index 82839e06b3..7e6ffe52da 100644 --- a/assignment-client/src/octree/OctreeServer.cpp +++ b/assignment-client/src/octree/OctreeServer.cpp @@ -998,7 +998,7 @@ void OctreeServer::nodeKilled(SharedNodePointer node) { qDebug() << qPrintable(_safeServerName) << "server resetting Linked Data for node:" << *node; node->setLinkedData(NULL); // set this first in case another thread comes through and tryes to acces this qDebug() << qPrintable(_safeServerName) << "server deleting Linked Data for node:" << *node; - delete nodeData; + nodeData->deleteLater(); } }