From b4679aa44a87ca8d5a5edc36169064705d34c2d6 Mon Sep 17 00:00:00 2001
From: Roxanne Skelly <roxanne@highfidelity.io>
Date: Mon, 26 Aug 2019 13:05:19 -0700
Subject: [PATCH 1/2] BUGZ-1276 - crash in soloNodeOfType This is suspected to
 be a race condition during shutdown where a static destructor may be called
 before the ScriptEngine thread stops running.  On OSX there is the
 possability of this.

---
 libraries/octree/src/OctreeEditPacketSender.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libraries/octree/src/OctreeEditPacketSender.cpp b/libraries/octree/src/OctreeEditPacketSender.cpp
index 7b84205691..b432a626ed 100644
--- a/libraries/octree/src/OctreeEditPacketSender.cpp
+++ b/libraries/octree/src/OctreeEditPacketSender.cpp
@@ -37,7 +37,11 @@ OctreeEditPacketSender::~OctreeEditPacketSender() {
 
 
 bool OctreeEditPacketSender::serversExist() const {
-    auto node = DependencyManager::get<NodeList>()->soloNodeOfType(getMyNodeType());
+    auto nodeList = DependencyManager::get<NodeList>();
+    if(!nodeList) {
+        return false;
+    }
+    auto node = nodeList->soloNodeOfType(getMyNodeType());
     return node && node->getActiveSocket();
 }
 

From 82522b04abadb23a2eb19efcf49e554cdf3f1358 Mon Sep 17 00:00:00 2001
From: Roxanne Skelly <roxanne@highfidelity.io>
Date: Mon, 26 Aug 2019 13:20:56 -0700
Subject: [PATCH 2/2] missing space

---
 libraries/octree/src/OctreeEditPacketSender.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/octree/src/OctreeEditPacketSender.cpp b/libraries/octree/src/OctreeEditPacketSender.cpp
index b432a626ed..2d0bc7380f 100644
--- a/libraries/octree/src/OctreeEditPacketSender.cpp
+++ b/libraries/octree/src/OctreeEditPacketSender.cpp
@@ -38,7 +38,7 @@ OctreeEditPacketSender::~OctreeEditPacketSender() {
 
 bool OctreeEditPacketSender::serversExist() const {
     auto nodeList = DependencyManager::get<NodeList>();
-    if(!nodeList) {
+    if (!nodeList) {
         return false;
     }
     auto node = nodeList->soloNodeOfType(getMyNodeType());