From 60832b071cb8088ec432131b464807e9d3c56b33 Mon Sep 17 00:00:00 2001
From: r3tk0n <r3tk0n@gmail.com>
Date: Thu, 15 Nov 2018 14:08:38 -0800
Subject: [PATCH] Fix logic for cases with rift headset but no touch
 controllers.

---
 interface/src/Application.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index aec580ff9d..a4277d6132 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -3414,10 +3414,18 @@ void Application::showHelp() {
         defaultTab = TAB_HAND_CONTROLLERS;
         handControllerName = HAND_CONTROLLER_NAME_VIVE;
     } else if (PluginUtils::isHMDAvailable(OCULUS_RIFT_PLUGIN_NAME)) {
-        defaultTab = TAB_HAND_CONTROLLERS;
-        handControllerName = HAND_CONTROLLER_NAME_OCULUS_TOUCH;
+        if (PluginUtils::isOculusTouchControllerAvailable()) {
+            defaultTab = TAB_HAND_CONTROLLERS;
+            handControllerName = HAND_CONTROLLER_NAME_OCULUS_TOUCH;
+        } else if (PluginUtils::isXboxControllerAvailable()) {
+            defaultTab = TAB_GAMEPAD;
+        } else {
+            defaultTab = TAB_KEYBOARD_MOUSE;
+        }
     } else if (PluginUtils::isXboxControllerAvailable()) {
         defaultTab = TAB_GAMEPAD;
+    } else {
+        defaultTab = TAB_KEYBOARD_MOUSE;
     }
 
     QUrlQuery queryString;