From 4659d22021b9b201e505673a2847c176b668c971 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Thu, 7 Dec 2017 21:32:18 -0800
Subject: [PATCH] work around a crash when closing CREATE

---
 scripts/system/libraries/gridTool.js        | 4 +++-
 scripts/system/marketplaces/marketplaces.js | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/system/libraries/gridTool.js b/scripts/system/libraries/gridTool.js
index 2c417a9dde..19d4417a12 100644
--- a/scripts/system/libraries/gridTool.js
+++ b/scripts/system/libraries/gridTool.js
@@ -242,7 +242,9 @@ GridTool = function(opts) {
 
     horizontalGrid.addListener(function(data) {
         webView.emitScriptEvent(JSON.stringify(data));
-        selectionDisplay.updateHandles();
+        if (selectionDisplay) {
+            selectionDisplay.updateHandles();
+        }
     });
 
     webView.webEventReceived.connect(function(data) {
diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js
index c9c439e57d..19b45be015 100644
--- a/scripts/system/marketplaces/marketplaces.js
+++ b/scripts/system/marketplaces/marketplaces.js
@@ -12,6 +12,8 @@
    Quat, MyAvatar, Clipboard, Menu, Grid, Uuid, GlobalServices, openLoginWindow */
 /* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
 
+var selectionDisplay = null; // for gridTool.js to ignore
+
 (function () { // BEGIN LOCAL_SCOPE
 
     Script.include("/~/system/libraries/accountUtils.js");