use correct cleanup calls in OctreeServer destructor

This commit is contained in:
Stephen Birarda 2013-12-05 11:43:48 -08:00
parent aac01ee70d
commit 5b6c2531a4

View file

@ -81,18 +81,18 @@ OctreeServer::~OctreeServer() {
delete _jurisdictionSender;
}
if (_voxelServerPacketProcessor) {
_voxelServerPacketProcessor->terminate();
delete _voxelServerPacketProcessor;
if (_octreeInboundPacketProcessor) {
_octreeInboundPacketProcessor->terminate();
delete _octreeInboundPacketProcessor;
}
if (_voxelPersistThread) {
_voxelPersistThread->terminate();
delete _voxelPersistThread;
if (_persistThread) {
_persistThread->terminate();
delete _persistThread;
}
// tell our NodeList we're done with notifications
NodeList::getInstance()->removeHook(&_nodeWatcher);
nodeList->removeHook(this);
delete _jurisdiction;
_jurisdiction = NULL;