mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-08-04 09:25:12 +02:00
tweak shutdown
This commit is contained in:
parent
7a683b177d
commit
dc302e7126
1 changed files with 11 additions and 4 deletions
|
@ -48,6 +48,8 @@ OctreeQueryNode::~OctreeQueryNode() {
|
|||
if (extraDebugging) {
|
||||
qDebug() << "OctreeQueryNode::~OctreeQueryNode()";
|
||||
}
|
||||
|
||||
/*
|
||||
if (_octreeSendThread) {
|
||||
if (extraDebugging) {
|
||||
qDebug() << "OctreeQueryNode::~OctreeQueryNode()... calling _octreeSendThread->terminate()";
|
||||
|
@ -58,6 +60,7 @@ OctreeQueryNode::~OctreeQueryNode() {
|
|||
}
|
||||
delete _octreeSendThread;
|
||||
}
|
||||
*/
|
||||
|
||||
delete[] _octreePacket;
|
||||
delete[] _lastOctreePacket;
|
||||
|
@ -79,16 +82,20 @@ void OctreeQueryNode::nodeKilled() {
|
|||
qDebug() << "OctreeQueryNode::nodeKilled()... ";
|
||||
_isShuttingDown = true;
|
||||
if (_octreeSendThread) {
|
||||
qDebug() << "OctreeQueryNode::nodeKilled()... calling _octreeSendThread->terminate()";
|
||||
_octreeSendThread->terminate();
|
||||
qDebug() << "OctreeQueryNode::nodeKilled()... AFTER _octreeSendThread->terminate()";
|
||||
|
||||
OctreeSendThread* sendThread = _octreeSendThread;
|
||||
|
||||
qDebug() << "OctreeQueryNode::nodeKilled()... calling _octreeSendThread = NULL";
|
||||
_octreeSendThread = NULL;
|
||||
qDebug() << "OctreeQueryNode::nodeKilled()... AFTER _octreeSendThread = NULL";
|
||||
|
||||
qDebug() << "OctreeQueryNode::nodeKilled()... calling _octreeSendThread->setIsShuttingDown()";
|
||||
sendThread->setIsShuttingDown();
|
||||
qDebug() << "OctreeQueryNode::nodeKilled()... AFTER _octreeSendThread->setIsShuttingDown()";
|
||||
|
||||
qDebug() << "OctreeQueryNode::nodeKilled()... calling _octreeSendThread->terminate()";
|
||||
sendThread->terminate();
|
||||
qDebug() << "OctreeQueryNode::nodeKilled()... AFTER _octreeSendThread->terminate()";
|
||||
|
||||
qDebug() << "OctreeQueryNode::nodeKilled()... calling delete sendThread";
|
||||
delete sendThread;
|
||||
qDebug() << "OctreeQueryNode::nodeKilled()... AFTER delete sendThread";
|
||||
|
|
Loading…
Reference in a new issue