fix: fixing assert when loading scene using its name

MirageNet · Sep 22, 2021 · 72ac3a6 · 72ac3a6
1 parent 6a97ae9
commit 72ac3a6
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/Assets/Mirage/Runtime/NetworkSceneManager.cs b/Assets/Mirage/Runtime/NetworkSceneManager.cs
@@ -672,13 +672,19 @@ private async UniTask LoadSceneNormalAsync(string scenePath)
                 }
 
                 await SceneLoadingAsyncOperationInfo;
-
-                logger.Assert(scenePath == ActiveScenePath, "[NetworkSceneManager] - Scene being loaded was not the active scene");
+                AssertSceneIsActive(scenePath);
 
                 CompleteLoadingScene(ActiveScenePath, SceneOperation.Normal);
             }
         }
 
+        [System.Diagnostics.Conditional("DEBUG")]
+        private void AssertSceneIsActive(string scenePath)
+        {
+            // equal to path or name of active scene
+            logger.Assert(scenePath == ActiveScenePath || scenePath == SceneManager.GetActiveScene().name, "[NetworkSceneManager] - Scene being loaded was not the active scene");
+        }
+
         /// <summary>
         ///     Load our scene additively.
         /// </summary>