fix NRE if tracked poses is null in BaseHandControllerDataProvider.cs

XRTK · May 17, 2021 · fdc4973 · fdc4973
1 parent b210c2e
commit fdc4973
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Runtime/Definitions/Controllers/Hands/BaseHandControllerDataProviderProfile.cs b/Runtime/Definitions/Controllers/Hands/BaseHandControllerDataProviderProfile.cs
@@ -61,7 +61,7 @@ public abstract class BaseHandControllerDataProviderProfile : BaseMixedRealityCo
 
         [SerializeField]
         [Tooltip("Tracked hand poses for pose detection.")]
-        private HandControllerPoseProfile[] trackedPoses = null;
+        private HandControllerPoseProfile[] trackedPoses = new HandControllerPoseProfile[0];
 
         /// <summary>
         /// Tracked hand poses for pose detection.
@@ -77,4 +77,4 @@ public override ControllerDefinition[] GetDefaultControllerOptions()
             };
         }
     }
-}
+}
diff --git a/Runtime/Providers/Controllers/Hands/BaseHandControllerDataProvider.cs b/Runtime/Providers/Controllers/Hands/BaseHandControllerDataProvider.cs
@@ -41,7 +41,8 @@ protected BaseHandControllerDataProvider(string name, uint priority, BaseHandCon
                 ? profile.BoundsMode
                 : inputSystemProfile.BoundsMode;
 
-            if (profile.TrackedPoses.Count > 0)
+            if (profile.TrackedPoses != null &&
+                profile.TrackedPoses.Count > 0)
             {
                 TrackedPoses = profile.TrackedPoses.Count != inputSystemProfile.TrackedPoses.Count
                     ? profile.TrackedPoses
@@ -70,4 +71,4 @@ protected BaseHandControllerDataProvider(string name, uint priority, BaseHandCon
         /// </summary>
         protected IReadOnlyList<HandControllerPoseProfile> TrackedPoses { get; }
     }
-}
+}