Merge pull request #9881 from keveleigh/fix-knuckles

keveleigh · web-flow · commit dddc52284c60 · 2021-05-25T19:10:16.000-07:00
Fix Knuckles name lookup
diff --git a/Assets/MRTK/Providers/OpenVR/OpenVRDeviceManager.cs b/Assets/MRTK/Providers/OpenVR/OpenVRDeviceManager.cs
@@ -192,7 +192,7 @@ protected override SupportedControllerType GetCurrentControllerType(string joyst
                 return SupportedControllerType.ViveWand;
             }
 
-            if (joystickName.Contains("Vive Knuckles"))
+            if (joystickName.Contains("Knuckles"))
             {
                 return SupportedControllerType.ViveKnuckles;
             }

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ protected override SupportedControllerType GetCurrentControllerType(string joyst`
`192`	`192`	`return SupportedControllerType.ViveWand;`
`193`	`193`	`}`
`194`	`194`
`195`		`- if (joystickName.Contains("Vive Knuckles"))`
	`195`	`+ if (joystickName.Contains("Knuckles"))`
`196`	`196`	`{`
`197`	`197`	`return SupportedControllerType.ViveKnuckles;`
`198`	`198`	`}`