From 01eb3eddabf2c4c7e31fd324d3de721faf943c4c Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Mon, 9 Jul 2018 10:46:02 -0700
Subject: [PATCH] Fix MS16480: Disable active ContextOverlays when disabling
 ContextOverlayInterface

---
 interface/src/ui/overlays/ContextOverlayInterface.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/interface/src/ui/overlays/ContextOverlayInterface.cpp b/interface/src/ui/overlays/ContextOverlayInterface.cpp
index aca186a589..c6323614c5 100644
--- a/interface/src/ui/overlays/ContextOverlayInterface.cpp
+++ b/interface/src/ui/overlays/ContextOverlayInterface.cpp
@@ -97,6 +97,10 @@ static const float CONTEXT_OVERLAY_UNHOVERED_COLORPULSE = 1.0f;
 
 void ContextOverlayInterface::setEnabled(bool enabled) {
     _enabled = enabled;
+    if (!enabled) {
+        // Destroy any potentially-active ContextOverlays when disabling the interface
+        createOrDestroyContextOverlay(EntityItemID(), PointerEvent());
+    }
 }
 
 void ContextOverlayInterface::clickDownOnEntity(const EntityItemID& entityItemID, const PointerEvent& event) {