From ab4bef7d55cbef9063ad0a53e85d5353e5fb66eb Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Mon, 13 Jun 2016 11:19:47 -0700
Subject: [PATCH] Fixes based on PR feedback

* The "Clear Overlay When Driving" avatar preference is obeyed.
* sensor reset will also center the ui.
---
 interface/src/Application.cpp         | 1 +
 interface/src/ui/OverlayConductor.cpp | 6 +++---
 interface/src/ui/OverlayConductor.h   | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 1e6f7ba995..e494142302 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -4209,6 +4209,7 @@ void Application::resetSensors(bool andReload) {
     DependencyManager::get<DdeFaceTracker>()->reset();
     DependencyManager::get<EyeTracker>()->reset();
     getActiveDisplayPlugin()->resetSensors();
+    _overlayConductor.centerUI();
     getMyAvatar()->reset(andReload);
     QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "reset", Qt::QueuedConnection);
 }
diff --git a/interface/src/ui/OverlayConductor.cpp b/interface/src/ui/OverlayConductor.cpp
index 01649a0b3a..b653d0f445 100644
--- a/interface/src/ui/OverlayConductor.cpp
+++ b/interface/src/ui/OverlayConductor.cpp
@@ -139,7 +139,7 @@ void OverlayConductor::update(float dt) {
 
     switch (getState()) {
         case Enabled:
-            if (qApp->isHMDMode() && headOutsideOverlay()) {
+            if (myAvatar->getClearOverlayWhenDriving() && qApp->isHMDMode() && headOutsideOverlay()) {
                 setState(DisabledByHead);
                 setEnabled(false);
             }
@@ -147,7 +147,7 @@ void OverlayConductor::update(float dt) {
                 setState(DisabledByToggle);
                 setEnabled(false);
             }
-            if (drivingChanged && isDriving) {
+            if (myAvatar->getClearOverlayWhenDriving() && drivingChanged && isDriving) {
                 setState(DisabledByDrive);
                 setEnabled(false);
             }
@@ -192,7 +192,7 @@ void OverlayConductor::setEnabled(bool enabled) {
 
     // if the new state is visible/enabled...
     MyAvatar* myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
-    if (_enabled && myAvatar->getClearOverlayWhenDriving() && qApp->isHMDMode()) {
+    if (_enabled && qApp->isHMDMode()) {
         centerUI();
     }
 }
diff --git a/interface/src/ui/OverlayConductor.h b/interface/src/ui/OverlayConductor.h
index 83d6957012..fcfdac72a5 100644
--- a/interface/src/ui/OverlayConductor.h
+++ b/interface/src/ui/OverlayConductor.h
@@ -20,13 +20,14 @@ public:
     void setEnabled(bool enable);
     bool getEnabled() const;
 
+    void centerUI();
+
 private:
     bool headOutsideOverlay() const;
     bool updateAvatarHasDriveInput();
     bool updateAvatarIsAtRest();
     bool userWishesToHide() const;
     bool userWishesToShow() const;
-    void centerUI();
 
     enum State {
         Enabled = 0,