Merge pull request #9898 from MaxWang-MS/async_mu_fix

Better handling of multiple AsyncCoroutineRunner

Author: MaxWang-MS

Assets/MRTK/Core/Utilities/Async/Internal/AsyncCoroutineRunner.cs

@@ -53,14 +53,7 @@ internal static AsyncCoroutineRunner Instance
             {
                 if (instance == null)
                 {
-                    AsyncCoroutineRunner[] instances = FindObjectsOfType<AsyncCoroutineRunner>();
-                    Debug.Assert(instances.Length <= 1, "[AsyncCoroutineRunner] There should only be one AsyncCoroutineRunner in the scene.");
-                    instance = instances.Length == 1 ? instances[0] : null;
-                    if (instance != null && !instance.enabled)
-                    {
-                        Debug.LogWarning("[AsyncCoroutineRunner] Found a disabled AsyncCoroutineRunner component. Enabling the component.");
-                        instance.enabled = true;
-                    }
+                    instance = FindObjectOfType<AsyncCoroutineRunner>();
                 }
 
                 // FindObjectOfType() only search for objects attached to active GameObjects. The FindObjectOfType(bool includeInactive) variant is not available to Unity 2019.4 and earlier so cannot be used.
@@ -78,19 +71,6 @@ internal static AsyncCoroutineRunner Instance
                             Debug.Log("[AsyncCoroutineRunner] Found a \"AsyncCoroutineRunner\" GameObject but didn't have the AsyncCoroutineRunner component attached. Attaching the script.");
                             instance = instanceGameObject.AddComponent<AsyncCoroutineRunner>();
                         }
-                        else
-                        {
-                            if (!instance.enabled)
-                            {
-                                Debug.LogWarning("[AsyncCoroutineRunner] Found a disabled AsyncCoroutineRunner component. Enabling the component.");
-                                instance.enabled = true;
-                            }
-                            if (!instanceGameObject.activeSelf)
-                            {
-                                Debug.LogWarning("[AsyncCoroutineRunner] Found an AsyncCoroutineRunner attached to an inactive GameObject. Setting the GameObject active.");
-                                instanceGameObject.SetActive(true);
-                            }
-                        }
                     }
                 }
 
@@ -99,6 +79,19 @@ internal static AsyncCoroutineRunner Instance
                     Debug.Log("[AsyncCoroutineRunner] There is no AsyncCoroutineRunner in the scene. Adding a GameObject with AsyncCoroutineRunner attached at the root of the scene.");
                     instance = new GameObject("AsyncCoroutineRunner").AddComponent<AsyncCoroutineRunner>();
                 }
+                else if (!instance.isActiveAndEnabled)
+                {
+                    if (!instance.enabled)
+                    {
+                        Debug.LogWarning("[AsyncCoroutineRunner] Found a disabled AsyncCoroutineRunner component. Enabling the component.");
+                        instance.enabled = true;
+                    }
+                    if (!instance.gameObject.activeSelf)
+                    {
+                        Debug.LogWarning("[AsyncCoroutineRunner] Found an AsyncCoroutineRunner attached to an inactive GameObject. Setting the GameObject active.");
+                        instance.gameObject.SetActive(true);
+                    }
+                }
 
                 instance.gameObject.hideFlags = HideFlags.None;
 
@@ -130,7 +123,12 @@ internal static void Post(Action task)
 
         private void Update()
         {
-            Debug.Assert(Instance == this, "[AsyncCoroutineRunner] There should only be one AsyncCoroutineRunner in the scene.");
+            if (Instance != this)
+            {
+                Debug.Log("[AsyncCoroutineRunner] Multiple active AsyncCoroutineRunners is present in the scene. Disabling duplicate ones.");
+                enabled = false;
+                return;
+            }
             isInstanceRunning = true;
 
             int actionCount;
@@ -163,8 +161,15 @@ private void OnDisable()
 
         private void OnEnable()
         {
-            Debug.Assert(Instance == this, "[AsyncCoroutineRunner] There should only be one AsyncCoroutineRunner in the scene.");
-            isInstanceRunning = true;
+            if (Instance != this)
+            {
+                Debug.Log("[AsyncCoroutineRunner] Multiple active AsyncCoroutineRunners is present in the scene. Disabling duplicate ones.");
+                enabled = false;
+            }
+            else
+            {
+                isInstanceRunning = true;
+            }
         }
     }
 }