Merge pull request #3594 from wassx/mrtk_development

David Kline · web-flow · commit 7d08359f0295 · 2019-03-12T07:25:50.000-07:00
Fix NRE when custom controller has no visualizer
diff --git a/Assets/MixedRealityToolkit.SDK/Features/Utilities/Solvers/ControllerFinder.cs b/Assets/MixedRealityToolkit.SDK/Features/Utilities/Solvers/ControllerFinder.cs
@@ -100,7 +100,7 @@ protected virtual void TryAndAddControllerTransform()
         /// <param name="newController">The new controller to be tracked.</param>
         protected virtual void AddControllerTransform(IMixedRealityController newController)
         {
-            if (newController.ControllerHandedness == handedness && newController.Visualizer.GameObjectProxy.transform != null && !newController.Visualizer.GameObjectProxy.transform.Equals(ControllerTransform))
+            if (newController.ControllerHandedness == handedness && newController.Visualizer != null && newController.Visualizer.GameObjectProxy.transform != null && !newController.Visualizer.GameObjectProxy.transform.Equals(ControllerTransform))
             {
                 ControllerTransform = newController.Visualizer.GameObjectProxy.transform;
 

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ protected virtual void TryAndAddControllerTransform()`
`100`	`100`	`/// <param name="newController">The new controller to be tracked.</param>`
`101`	`101`	`protected virtual void AddControllerTransform(IMixedRealityController newController)`
`102`	`102`	`{`
`103`		`- if (newController.ControllerHandedness == handedness && newController.Visualizer.GameObjectProxy.transform != null && !newController.Visualizer.GameObjectProxy.transform.Equals(ControllerTransform))`
	`103`	`+ if (newController.ControllerHandedness == handedness && newController.Visualizer != null && newController.Visualizer.GameObjectProxy.transform != null && !newController.Visualizer.GameObjectProxy.transform.Equals(ControllerTransform))`
`104`	`104`	`{`
`105`	`105`	`ControllerTransform = newController.Visualizer.GameObjectProxy.transform;`
`106`	`106`