From 6e3057479ffacde155330039d249b242210adb92 Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Thu, 9 Jun 2016 11:27:02 -0700
Subject: [PATCH] fixes for warnings

Also overlays menu option should work better in conjunction with ui-center/fading
---
 interface/src/ui/OverlayConductor.cpp | 4 +---
 interface/src/ui/OverlayConductor.h   | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/interface/src/ui/OverlayConductor.cpp b/interface/src/ui/OverlayConductor.cpp
index c4fd938e97..9e2e8cb0db 100644
--- a/interface/src/ui/OverlayConductor.cpp
+++ b/interface/src/ui/OverlayConductor.cpp
@@ -71,9 +71,7 @@ void OverlayConductor::update(float dt) {
         } else if ((usecTimestampNow() - _timeInPotentialMode) > (nowDriving ? REQUIRED_USECS_IN_NEW_MODE_BEFORE_INVISIBLE : REQUIRED_USECS_IN_NEW_MODE_BEFORE_VISIBLE)) {
             _timeInPotentialMode = 0; // a real transition
             bool wantsOverlays = Menu::getInstance()->isOptionChecked(MenuOption::Overlays);
-            if (wantsOverlays) {
-                setEnabled(!nowDriving);
-            }
+            setEnabled(!nowDriving && wantsOverlays);
             _driving = nowDriving;
         }
 
diff --git a/interface/src/ui/OverlayConductor.h b/interface/src/ui/OverlayConductor.h
index 4ecbac5bcf..2e425454c7 100644
--- a/interface/src/ui/OverlayConductor.h
+++ b/interface/src/ui/OverlayConductor.h
@@ -34,7 +34,6 @@ private:
     bool _enabled { false };
     bool _driving { false };
     quint64 _timeInPotentialMode { 0 };
-    bool _wantsOverlays { true };
 };
 
 #endif