Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 17:24:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

repair add of new node (so it doesn't immediately kill)

Browse source
This commit is contained in:
Stephen Birarda 2014-01-13 17:29:45 -08:00
parent 677303b5c0
commit 6a0c431562
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/shared/src/Node.cpp
View file

@ -39,6 +39,8 @@ Node::Node(const QUuid& uuid, char type, const HifiSockAddr& publicSocket, const
}
Node::~Node() {
qDebug() << "Destructor for node with UUID" << _uuid << "called.\n";
if (_linkedData) {
_linkedData->deleteOrDeleteLater();
}

7
libraries/shared/src/NodeList.cpp
View file

@ -684,14 +684,15 @@ SharedNodePointer NodeList::addOrUpdateNode(const QUuid& uuid, char nodeType,
if (matchingNodeItem == _nodeHash.end()) {
// we didn't have this node, so add them
Node* newNode = new Node(uuid, nodeType, publicSocket, localSocket);
SharedNodePointer newNodeSharedPointer(newNode, &QObject::deleteLater);
NodeHash::iterator addedItem = _nodeHash.insert(newNode->getUUID(), SharedNodePointer(newNode, &QObject::deleteLater));
_nodeHash.insert(newNode->getUUID(), newNodeSharedPointer);
qDebug() << "Added" << *newNode << "\n";
emit nodeAdded(addedItem.value());
emit nodeAdded(newNodeSharedPointer);
return SharedNodePointer(newNode);
return newNodeSharedPointer;
} else {
SharedNodePointer node = matchingNodeItem.value();
matchingNodeItem.value()->lock();