Fixed input handler race condition if input system and teleport system not found before gameobjects wake up

Author: StephenHodgson

Assets/MixedRealityToolkit-SDK/Features/Input/GazeProvider.cs

@@ -268,8 +268,10 @@ protected override void OnEnable()
             }
         }
 
-        protected virtual void Start()
+        protected override void Start()
         {
+            base.Start();
+
             if (cursorPrefab != null)
             {
                 var cursorObj = Instantiate(cursorPrefab, transform.parent);

Assets/MixedRealityToolkit-SDK/Features/Input/Handlers/SpeechInputHandler.cs

@@ -33,8 +33,10 @@ public class SpeechInputHandler : BaseInputHandler, IMixedRealitySpeechHandler
 
         #region MonoBehaviour Implementation
 
-        private void Start()
+        protected override void Start()
         {
+            base.Start();
+
             if (persistentKeywords)
             {
                 Debug.Assert(gameObject.transform.parent == null, "Persistent keyword GameObject must be at the root level of the scene hierarchy.");

Assets/MixedRealityToolkit-SDK/Features/Input/InputSystemGlobalListener.cs

@@ -15,16 +15,40 @@ public class InputSystemGlobalListener : MonoBehaviour
         private static IMixedRealityInputSystem inputSystem = null;
         protected static IMixedRealityInputSystem InputSystem => inputSystem ?? (inputSystem = MixedRealityManager.Instance.GetManager<IMixedRealityInputSystem>());
 
+        private bool lateInitialize = true;
+
         protected virtual void OnEnable()
         {
-            Debug.Assert(MixedRealityManager.IsInitialized, "No Mixed Reality Manager found in the scene.  Be sure to run the Mixed Reality Configuration.");
-            Debug.Assert(InputSystem != null, "No Input System found, Did you set it up in your configuration profile?");
-            InputSystem.Register(gameObject);
+            if (!MixedRealityManager.IsInitialized)
+            {
+                Debug.LogError("Missing Mixed Reality Manager!");
+                return;
+            }
+
+            if (InputSystem != null && !lateInitialize)
+            {
+                InputSystem.Register(gameObject);
+            }
+        }
+
+        protected virtual void Start()
+        {
+            if (lateInitialize)
+            {
+                if (InputSystem == null)
+                {
+                    Debug.LogError("Unable to find Input System!");
+                    return;
+                }
+
+                lateInitialize = false;
+                InputSystem.Register(gameObject);
+            }
         }
 
         protected virtual void OnDisable()
         {
-            InputSystem.Unregister(gameObject);
+            InputSystem?.Unregister(gameObject);
         }
     }
 }

Assets/MixedRealityToolkit-SDK/Features/UX/Scripts/Cursors/BaseCursor.cs

@@ -316,6 +316,10 @@ protected virtual void UpdateCursorTransform()
                 {
                     Debug.LogError($"{name}: Unable to get focus details for {pointer.GetType().Name}!");
                 }
+                else
+                {
+                    Debug.LogWarning($"{pointer.GetType().Name} not registered!");
+                }
 
                 return;
             }

Assets/MixedRealityToolkit-SDK/Features/UX/Scripts/Pointers/BaseControllerPointer.cs

@@ -61,6 +61,8 @@ public abstract class BaseControllerPointer : ControllerPoseSynchronizer, IMixed
 
         protected bool IsTeleportRequestActive = false;
 
+        private bool lateRegisterTeleport = false;
+
         /// <summary>
         /// The forward direction of the targeting ray
         /// </summary>
@@ -116,7 +118,33 @@ protected override void OnEnable()
             base.OnEnable();
             SetCursor();
             BaseCursor?.SetVisibility(true);
-            TeleportSystem?.Register(gameObject);
+
+            if (TeleportSystem == null)
+            {
+                lateRegisterTeleport = true;
+            }
+            else if (!lateRegisterTeleport)
+            {
+                TeleportSystem.Register(gameObject);
+            }
+        }
+
+        protected override void Start()
+        {
+            base.Start();
+
+            if (lateRegisterTeleport)
+            {
+                if (TeleportSystem == null)
+                {
+                    Debug.LogError("Failed to find the Teleport System!");
+                }
+                else
+                {
+                    lateRegisterTeleport = false;
+                    TeleportSystem.Register(gameObject);
+                }
+            }
         }
 
         protected override void OnDisable()
@@ -171,7 +199,7 @@ public string PointerName
         }
 
         /// <inheritdoc />
-        public IMixedRealityInputSource InputSourceParent { get; private set; }
+        public IMixedRealityInputSource InputSourceParent { get; protected set; }
 
         /// <inheritdoc />
         public IMixedRealityCursor BaseCursor { get; set; }