From 5b6c2531a468a07450c15d7c47bb5d8877e89df5 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 5 Dec 2013 11:43:48 -0800
Subject: [PATCH] use correct cleanup calls in OctreeServer destructor

---
 libraries/octree-server/src/OctreeServer.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/libraries/octree-server/src/OctreeServer.cpp b/libraries/octree-server/src/OctreeServer.cpp
index f9128e812b..a18e8c1af4 100644
--- a/libraries/octree-server/src/OctreeServer.cpp
+++ b/libraries/octree-server/src/OctreeServer.cpp
@@ -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;