From 88ea6fa5896e71e3e6141439d337956b27d0826a Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 19 Jan 2017 16:59:33 -0800
Subject: [PATCH] call script engine shutdown when assignment stopping

---
 assignment-client/src/scripts/EntityScriptServer.cpp | 4 +++-
 assignment-client/src/scripts/EntityScriptServer.h   | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/assignment-client/src/scripts/EntityScriptServer.cpp b/assignment-client/src/scripts/EntityScriptServer.cpp
index 55e0973094..caf9a26582 100644
--- a/assignment-client/src/scripts/EntityScriptServer.cpp
+++ b/assignment-client/src/scripts/EntityScriptServer.cpp
@@ -254,7 +254,7 @@ void EntityScriptServer::clear() {
     _entityViewer.clear();
 }
 
-void EntityScriptServer::shutdown() {
+void EntityScriptServer::shutdownScriptEngine() {
     if (_entitiesScriptEngine) {
         _entitiesScriptEngine->disconnectNonEssentialSignals(); // disconnect all slots/signals from the script engine, except essential
     }
@@ -351,6 +351,8 @@ void EntityScriptServer::handleJurisdictionPacket(QSharedPointer<ReceivedMessage
 }
 
 void EntityScriptServer::aboutToFinish() {
+    shutdownScriptEngine();
+
     // our entity tree is going to go away so tell that to the EntityScriptingInterface
     DependencyManager::get<EntityScriptingInterface>()->setEntityTree(nullptr);
 
diff --git a/assignment-client/src/scripts/EntityScriptServer.h b/assignment-client/src/scripts/EntityScriptServer.h
index 55c639476b..9ea2d43aec 100644
--- a/assignment-client/src/scripts/EntityScriptServer.h
+++ b/assignment-client/src/scripts/EntityScriptServer.h
@@ -48,7 +48,8 @@ private:
 
     void resetEntitiesScriptEngine();
     void clear();
-    void shutdown();
+    void shutdownScriptEngine();
+
     void addingEntity(const EntityItemID& entityID);
     void deletingEntity(const EntityItemID& entityID);
     void entityServerScriptChanging(const EntityItemID& entityID, const bool reload);