From e6f7457d0ce18a97ae812303d5c02d049694f94b Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Wed, 12 Jul 2017 15:17:23 -0700 Subject: [PATCH] Fixes --- .../marketplace/spectator-camera/spectatorCamera.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/unpublishedScripts/marketplace/spectator-camera/spectatorCamera.js b/unpublishedScripts/marketplace/spectator-camera/spectatorCamera.js index 283d502820..28d57528cd 100644 --- a/unpublishedScripts/marketplace/spectator-camera/spectatorCamera.js +++ b/unpublishedScripts/marketplace/spectator-camera/spectatorCamera.js @@ -157,7 +157,7 @@ if ((isHMDMode || showSpectatorInDesktop) && !isShuttingDown) { button = tablet.addButton({ text: buttonName, - icon: Script.resourcesPath() + "icons/tablet-icons/spectator-i.svg" + icon: "icons/tablet-icons/spectator-i.svg" }); button.clicked.connect(onTabletButtonClicked); } @@ -344,9 +344,9 @@ function registerButtonMappings() { var VRDevices = Controller.getDeviceNames().toString(); if (VRDevices) { - if (VRDevices.includes("Vive")) { + if (VRDevices.indexOf("Vive") != -1) { controllerType = "Vive"; - } else if (VRDevices.includes("OculusTouch")) { + } else if (VRDevices.indexOf("OculusTouch") != -1) { controllerType = "OculusTouch"; } else { sendToQml({ method: 'updateControllerMappingCheckbox', setting: switchViewFromController, controller: controllerType });