Merge pull request #2821 from StephenHodgson/vNEXT-GazeProviderUpdate

StephenHodgson · web-flow · commit 2a23e0235a28 · 2018-09-24T22:30:16.000-07:00
Ensured Input System is valid before setting cursor on Gaze Provider.
diff --git a/Assets/MixedRealityToolkit-SDK/Features/Input/GazeProvider.cs b/Assets/MixedRealityToolkit-SDK/Features/Input/GazeProvider.cs
@@ -269,10 +269,12 @@ protected override void OnEnable()
             }
         }
 
-        protected override void Start()
+        protected override async void Start()
         {
             base.Start();
 
+            await WaitUntilInputSystemValid;
+
             if (cursorPrefab != null)
             {
                 var cursorObj = Instantiate(cursorPrefab, transform.parent);

Original file line number	Diff line number	Diff line change
`@@ -269,10 +269,12 @@ protected override void OnEnable()`
`269`	`269`	`}`
`270`	`270`	`}`
`271`	`271`
`272`		`- protected override void Start()`
	`272`	`+ protected override async void Start()`
`273`	`273`	`{`
`274`	`274`	`base.Start();`
`275`	`275`
	`276`	`+ await WaitUntilInputSystemValid;`
	`277`	`+`
`276`	`278`	`if (cursorPrefab != null)`
`277`	`279`	`{`
`278`	`280`	`var cursorObj = Instantiate(cursorPrefab, transform.parent);`