From 3cbbb5fb7975f369d0e2d4d90bbbad34721c965b Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Tue, 18 Aug 2015 00:05:02 -0700
Subject: [PATCH] Fix crash on mouse click

---
 interface/src/Application.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 449afae5d1..4e790bfa88 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -712,6 +712,10 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
                     _keyboardFocusHighlightID = getOverlays().addOverlay(_keyboardFocusHighlight);
                 }
             }
+            if (_keyboardFocusedItem == UNKNOWN_ENTITY_ID && _keyboardFocusHighlight) {
+                _keyboardFocusHighlight->setVisible(false);
+            }
+
         }
     });
 
@@ -719,7 +723,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
     connect(getEntities(), &EntityTreeRenderer::mousePressOffEntity, 
         [=](const RayToEntityIntersectionResult& entityItemID, const QMouseEvent* event, unsigned int deviceId) {
         _keyboardFocusedItem = UNKNOWN_ENTITY_ID;
-        _keyboardFocusHighlight->setVisible(false);
+        if (_keyboardFocusHighlight) {
+            _keyboardFocusHighlight->setVisible(false);
+        }
     });
 }