From dbd6cb71c9aadc491fa667becf566be2a6fc3d06 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Thu, 13 Feb 2014 20:55:16 -0800
Subject: [PATCH] fixed crash on shutdown with multiple scripts

---
 libraries/octree/src/OctreeScriptingInterface.cpp | 13 +++++++++++--
 libraries/octree/src/OctreeScriptingInterface.h   |  1 +
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/libraries/octree/src/OctreeScriptingInterface.cpp b/libraries/octree/src/OctreeScriptingInterface.cpp
index 553ab961df..89bf5ceb62 100644
--- a/libraries/octree/src/OctreeScriptingInterface.cpp
+++ b/libraries/octree/src/OctreeScriptingInterface.cpp
@@ -11,13 +11,19 @@
 #include "OctreeScriptingInterface.h"
 
 OctreeScriptingInterface::OctreeScriptingInterface(OctreeEditPacketSender* packetSender, 
-                JurisdictionListener* jurisdictionListener)
+                JurisdictionListener* jurisdictionListener) :
+    _packetSender(NULL),
+    _jurisdictionListener(NULL),
+    _managedPacketSender(false), 
+    _managedJurisdictionListener(false),
+    _initialized(false)
 {
     setPacketSender(packetSender);
     setJurisdictionListener(jurisdictionListener);
 }
 
 OctreeScriptingInterface::~OctreeScriptingInterface() {
+qDebug() << "OctreeScriptingInterface::~OctreeScriptingInterface() this=" << this;
     cleanupManagedObjects();
 }
 
@@ -45,6 +51,9 @@ void OctreeScriptingInterface::setJurisdictionListener(JurisdictionListener* jur
 }
 
 void OctreeScriptingInterface::init() {
+    if (_initialized) {
+        return;
+    }
     if (_jurisdictionListener) {
         _managedJurisdictionListener = false;
     } else {
@@ -64,5 +73,5 @@ void OctreeScriptingInterface::init() {
     if (QCoreApplication::instance()) {
         connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), this, SLOT(cleanupManagedObjects()));
     }
-
+    _initialized = true;
 }
diff --git a/libraries/octree/src/OctreeScriptingInterface.h b/libraries/octree/src/OctreeScriptingInterface.h
index 34eddd8bed..3c832cbae8 100644
--- a/libraries/octree/src/OctreeScriptingInterface.h
+++ b/libraries/octree/src/OctreeScriptingInterface.h
@@ -93,6 +93,7 @@ protected:
     JurisdictionListener* _jurisdictionListener;
     bool _managedPacketSender;
     bool _managedJurisdictionListener;
+    bool _initialized;
 };
 
 #endif /* defined(__hifi__OctreeScriptingInterface__) */