From 5823efce76b03f108d3da802d741b18db6fab215 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Mon, 10 Jul 2017 15:51:27 -0700
Subject: [PATCH] Cleanup

---
 scripts/system/spectatorCamera.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/system/spectatorCamera.js b/scripts/system/spectatorCamera.js
index 96785a7a03..c1b23ea02c 100644
--- a/scripts/system/spectatorCamera.js
+++ b/scripts/system/spectatorCamera.js
@@ -329,7 +329,6 @@
     var controllerMapping;
     var controllerType = "Other";
     function registerButtonMappings() {
-
         var VRDevices = Controller.getDeviceNames().toString();
         if (VRDevices) {
             if (VRDevices.includes("Vive")) {
@@ -337,6 +336,7 @@
             } else if (VRDevices.includes("OculusTouch")) {
                 controllerType = "OculusTouch";
             } else {
+                sendToQml({ method: 'updateControllerMappingCheckbox', setting: switchViewFromController, controller: controllerType });
                 return; // Neither Vive nor Touch detected
             }
         }
@@ -384,12 +384,13 @@
             tablet.loadQMLSource(SPECTATOR_CAMERA_QML_SOURCE);
             sendToQml({ method: 'updateSpectatorCameraCheckbox', params: !!camera });
             sendToQml({ method: 'updateMonitorShowsSwitch', params: monitorShowsCameraView });
-            sendToQml({ method: 'updateControllerMappingCheckbox', setting: switchViewFromController, controller: controllerType });
-            Menu.setIsOptionChecked("Disable Preview", false);
-            Menu.setIsOptionChecked("Mono Preview", true);
             if (!controllerMapping) {
                 registerButtonMappings();
+            } else {
+                sendToQml({ method: 'updateControllerMappingCheckbox', setting: switchViewFromController, controller: controllerType });
             }
+            Menu.setIsOptionChecked("Disable Preview", false);
+            Menu.setIsOptionChecked("Mono Preview", true);
         }
     }