From 5d52b9936b45dd2086d5f02a079a7559d6084071 Mon Sep 17 00:00:00 2001
From: Menithal <menithal@menithal.com>
Date: Mon, 27 Nov 2017 07:42:18 +0200
Subject: [PATCH] 21539: Updated Logic to match request

---
 interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml | 1 -
 plugins/openvr/src/ViveControllerManager.cpp                | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml b/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml
index 292a33f4c5..075b4637b2 100644
--- a/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml
+++ b/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml
@@ -158,7 +158,6 @@ Rectangle {
         }
 
         RalewayBold {
-            id: hmdInDesktopLabel
             size: 12
             visible: viveInDesktop.checked
             text: "None"
diff --git a/plugins/openvr/src/ViveControllerManager.cpp b/plugins/openvr/src/ViveControllerManager.cpp
index 4e1f8717c6..8889e58f0c 100644
--- a/plugins/openvr/src/ViveControllerManager.cpp
+++ b/plugins/openvr/src/ViveControllerManager.cpp
@@ -168,7 +168,6 @@ void ViveControllerManager::setConfigurationSettings(const QJsonObject configura
         }
 
         if (configurationSettings.contains("hmdDesktopTracking")) {
-
             _hmdDesktopTracking = configurationSettings["hmdDesktopTracking"].toBool();
         }
 
@@ -458,7 +457,7 @@ void ViveControllerManager::InputDevice::configureCalibrationSettings(const QJso
             iter++;
         }
 
-        _hmdTrackingEnabled = !(hmdDesktopMode && !hmdDesktopTracking);
+        _hmdTrackingEnabled = !(hmdDesktopMode && hmdDesktopTracking);
     }
 }