From 7bcf727a835cc446b1f917a130f80af45c1ddfd4 Mon Sep 17 00:00:00 2001
From: danteruiz <danteruiz102@gmail.com>
Date: Thu, 28 Feb 2019 18:11:51 -0800
Subject: [PATCH] review changes

---
 interface/src/Application.cpp | 6 ++----
 interface/src/Application.h   | 1 -
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 274d6919af..248ada4376 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -4980,9 +4980,8 @@ void Application::idle() {
     }
 
     {
-        if (_keyboardFocusWaitingOnRenderable && getEntities()->renderableForEntityId(_entityIdWaitingOnRenderable.get())) {
-            QUuid entityId = _entityIdWaitingOnRenderable.get();
-            _entityIdWaitingOnRenderable.set(UNKNOWN_ENTITY_ID);
+        if (_keyboardFocusWaitingOnRenderable && getEntities()->renderableForEntityId(_keyboardFocusedEntity.get())) {
+            QUuid entityId = _keyboardFocusedEntity.get();
             setKeyboardFocusEntity(UNKNOWN_ENTITY_ID);
             _keyboardFocusWaitingOnRenderable = false;
             setKeyboardFocusEntity(entityId);
@@ -5837,7 +5836,6 @@ void Application::setKeyboardFocusEntity(const QUuid& id) {
                 auto entityItemRenderable = entities->renderableForEntityId(entityId);
                 if (!entityItemRenderable) {
                     _keyboardFocusWaitingOnRenderable = true;
-                    _entityIdWaitingOnRenderable.set(id);
                 } else if (entityItemRenderable->wantsKeyboardFocus()) {
                     entities->setProxyWindow(entityId, _window->windowHandle());
                     if (_keyboardMouseDevice->isActive()) {
diff --git a/interface/src/Application.h b/interface/src/Application.h
index 5e3090973a..c16f260192 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -733,7 +733,6 @@ private:
 
     bool _reticleClickPressed { false };
     bool _keyboardFocusWaitingOnRenderable { false };
-    ThreadSafeValueCache<EntityItemID> _entityIdWaitingOnRenderable;
 
     int _avatarAttachmentRequest = 0;