From e35efccfa3bbe9ce86d95610a9f9ed3b7554414a Mon Sep 17 00:00:00 2001
From: Liv Erickson <liv@highfidelity.io>
Date: Tue, 17 Apr 2018 17:11:37 -0700
Subject: [PATCH] make icon slightly more robust

---
 scripts/system/edit.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index ba984cb307..a1b2c91bef 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -457,15 +457,25 @@ var toolBar = (function () {
         Window.domainChanged.connect(function () {
             that.setActive(false);
             that.clearEntityList();
-            handleDomainChange();
+            checkEditPermissionsAndUpdate();
         });
 
         Entities.canAdjustLocksChanged.connect(function (canAdjustLocks) {
             if (isActive && !canAdjustLocks) {
                 that.setActive(false);
+                tablet.gotoHomeScreen();
             }
+            checkEditPermissionsAndUpdate();
         });
 
+        Entities.canRezChanged.connect(function (canRez) {
+            if (isActive && !canRez) {
+                that.setActive(false);
+                tablet.gotoHomeScreen();
+            }
+            checkEditPermissionsAndUpdate();
+        })
+
         var hasRezPermissions = (Entities.canRez() || Entities.canRezTmp() || Entities.canRezCertified() || Entities.canRezTmpCertified());
         var createButtonIconRsrc = (hasRezPermissions ? CREATE_ENABLED_ICON : CREATE_DISABLED_ICON);
         tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
@@ -852,7 +862,7 @@ function handleOverlaySelectionToolUpdates(channel, message, sender) {
 }
 
 // Handles any edit mode updates required when domains have switched
-function handleDomainChange() {
+function checkEditPermissionsAndUpdate() {
     if ( (createButton === null) || (createButton === undefined) ){
         //--EARLY EXIT--( nothing to safely update )
         return;