From 2ae0a7defc2bfbcdb4fc030d56153e1736363d37 Mon Sep 17 00:00:00 2001
From: howard-stearns <howard.stearns@gmail.com>
Date: Fri, 24 Jun 2016 14:46:46 -0700
Subject: [PATCH] If there are TWO conditions holding things back, weight for
 them both to clear.

---
 interface/src/ui/OverlayConductor.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/interface/src/ui/OverlayConductor.cpp b/interface/src/ui/OverlayConductor.cpp
index 7d0dc6c650..e18522cb2f 100644
--- a/interface/src/ui/OverlayConductor.cpp
+++ b/interface/src/ui/OverlayConductor.cpp
@@ -123,7 +123,9 @@ void OverlayConductor::update(float dt) {
     if (_flags & SuppressedByDrive) {
         if (!isDriving) {
             _flags &= ~SuppressedByDrive;
-            shouldRecenter = true;
+            if (_flags & SuppressMask) {
+                shouldRecenter = true;
+            }
         }
     } else {
         if (myAvatar->getClearOverlayWhenMoving() && drivingChanged && isDriving) {
@@ -134,7 +136,9 @@ void OverlayConductor::update(float dt) {
     if (_flags & SuppressedByHead) {
         if (isAtRest) {
             _flags &= ~SuppressedByHead;
-            shouldRecenter = true;
+            if (_flags & SuppressMask) {
+                shouldRecenter = true;
+            }
         }
     } else {
         if (_hmdMode && headOutsideOverlay()) {