From 8a7561d61ba30391147691349c3ecab9416cf46a Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 26 Jul 2017 16:35:55 -0700
Subject: [PATCH] IT'S WORKING SOB SOB SOB

---
 interface/src/ui/overlays/ContextOverlayInterface.cpp | 9 +++++----
 scripts/system/controllers/handControllerGrab.js      | 1 -
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/interface/src/ui/overlays/ContextOverlayInterface.cpp b/interface/src/ui/overlays/ContextOverlayInterface.cpp
index e6d1af0af5..668766abbf 100644
--- a/interface/src/ui/overlays/ContextOverlayInterface.cpp
+++ b/interface/src/ui/overlays/ContextOverlayInterface.cpp
@@ -153,7 +153,10 @@ bool ContextOverlayInterface::createOrDestroyContextOverlay(const EntityItemID&
             return true;
         }
     } else {
-        return destroyContextOverlay(entityItemID, event);
+        if (!_currentEntityWithContextOverlay.isNull()) {
+            return destroyContextOverlay(_currentEntityWithContextOverlay, event);
+        }
+        return false;
     }
     return false;
 }
@@ -166,9 +169,7 @@ bool ContextOverlayInterface::contextOverlayFilterPassed(const EntityItemID& ent
 bool ContextOverlayInterface::destroyContextOverlay(const EntityItemID& entityItemID, const PointerEvent& event) {
     if (_contextOverlayID != UNKNOWN_OVERLAY_ID) {
         qCDebug(context_overlay) << "Destroying Context Overlay on top of entity with ID: " << entityItemID;
-        if (!_currentEntityWithContextOverlay.isNull() && _currentEntityWithContextOverlay != entityItemID) {
-            disableEntityHighlight(_currentEntityWithContextOverlay);
-        }
+        disableEntityHighlight(entityItemID);
         setCurrentEntityWithContextOverlay(QUuid());
         _entityMarketplaceID.clear();
         // Destroy the Context Overlay
diff --git a/scripts/system/controllers/handControllerGrab.js b/scripts/system/controllers/handControllerGrab.js
index 82691003e2..bd8ab26506 100644
--- a/scripts/system/controllers/handControllerGrab.js
+++ b/scripts/system/controllers/handControllerGrab.js
@@ -2246,7 +2246,6 @@ function MyController(hand) {
             button: "None"
         };
         if (rayPickInfo.entityID) {
-            print("ZRF: " + hoveredEntityID);
             if (hoveredEntityID !== rayPickInfo.entityID) {
                 if (contextOverlayTimer) {
                     Script.clearTimeout(contextOverlayTimer);