From 4711c23d9d5b612214689c9711dcd7a8709128fe Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zach@highfidelity.io>
Date: Tue, 10 May 2016 14:34:12 -0700
Subject: [PATCH] Delay AvatarInputs instantiation to first paint

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

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index bce0b77096..4ae206795d 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2619,6 +2619,9 @@ void Application::idle() {
         firstIdle = false;
         connect(offscreenUi.data(), &OffscreenUi::showDesktop, this, &Application::showDesktop);
         _overlayConductor.setEnabled(Menu::getInstance()->isOptionChecked(MenuOption::Overlays));
+    } else {
+        // FIXME: AvatarInputs are positioned incorrectly if instantiated before the first paint
+        AvatarInputs::getInstance()->update();
     }
 
     PROFILE_RANGE(__FUNCTION__);
@@ -2641,7 +2644,6 @@ void Application::idle() {
     checkChangeCursor();
 
     Stats::getInstance()->updateStats();
-    AvatarInputs::getInstance()->update();
 
     _simCounter.increment();