fix(Caching): get specific ControllerManager for left/right controller

ExtendRealityLtd · Oct 15, 2016 · d817dc4 · d817dc4
1 parent e79f4fc
commit d817dc4
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/Assets/VRTK/SDK/SteamVR/SDK_SteamVR.cs b/Assets/VRTK/SDK/SteamVR/SDK_SteamVR.cs
@@ -470,7 +470,14 @@ private SteamVR_ControllerManager GetControllerManager()
         {
             if (cachedControllerManager == null)
             {
-                cachedControllerManager = FindObjectOfType<SteamVR_ControllerManager>();
+                SteamVR_ControllerManager[] controllerManagers = FindObjectsOfType<SteamVR_ControllerManager>();
+                foreach (SteamVR_ControllerManager cm in controllerManagers)
+                {
+                    if (cm.left && cm.right) 
+                    {
+                        cachedControllerManager = cm;
+                    }
+                }
             }
             return cachedControllerManager;
         }