From 8f96715521d78151bd38a383b455ee0af3351553 Mon Sep 17 00:00:00 2001
From: Brad Hefta-Gaub <brad@highfidelity.io>
Date: Fri, 23 Sep 2016 14:27:57 -0700
Subject: [PATCH] only activate a touch device if one is connected

---
 plugins/oculus/src/OculusControllerManager.cpp | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/plugins/oculus/src/OculusControllerManager.cpp b/plugins/oculus/src/OculusControllerManager.cpp
index b3754805db..5d493f4c9d 100644
--- a/plugins/oculus/src/OculusControllerManager.cpp
+++ b/plugins/oculus/src/OculusControllerManager.cpp
@@ -45,14 +45,20 @@ bool OculusControllerManager::activate() {
     // register with UserInputMapper
     auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();
 
-    if (OVR_SUCCESS(ovr_GetInputState(_session, ovrControllerType_Remote, &_inputState))) {
-        _remote = std::make_shared<RemoteDevice>(*this);
-        userInputMapper->registerDevice(_remote);
+    unsigned int controllerConnected = ovr_GetConnectedControllerTypes(_session);
+
+    if ((controllerConnected & ovrControllerType_Remote) == ovrControllerType_Remote) {
+        if (OVR_SUCCESS(ovr_GetInputState(_session, ovrControllerType_Remote, &_inputState))) {
+            _remote = std::make_shared<RemoteDevice>(*this);
+            userInputMapper->registerDevice(_remote);
+        }
     }
 
-    if (OVR_SUCCESS(ovr_GetInputState(_session, ovrControllerType_Touch, &_inputState))) {
-        _touch = std::make_shared<TouchDevice>(*this);
-        userInputMapper->registerDevice(_touch);
+    if ((controllerConnected & ovrControllerType_Touch) != 0) {
+        if (OVR_SUCCESS(ovr_GetInputState(_session, ovrControllerType_Touch, &_inputState))) {
+            _touch = std::make_shared<TouchDevice>(*this);
+            userInputMapper->registerDevice(_touch);
+        }
     }
 
     return true;