fix: prevent NRE when operating as a separated client and server (#283)

MirageNet · Jul 14, 2020 · e10e198 · e10e198
1 parent 5986e32
commit e10e198
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Assets/Mirror/Runtime/NetworkSceneManager.cs b/Assets/Mirror/Runtime/NetworkSceneManager.cs
@@ -128,7 +128,7 @@ void OnSceneLoaded(Scene scene, LoadSceneMode mode)
         internal void FinishLoadScene()
         {
             // host mode?
-            if (client.IsLocalClient)
+            if (client && client.IsLocalClient)
             {
                 FinishLoadSceneHost();
             }
@@ -138,7 +138,7 @@ internal void FinishLoadScene()
                 FinishLoadSceneServerOnly();
             }
             // client-only mode?
-            else if (client.Active)
+            else if (client && client.Active)
             {
                 FinishLoadSceneClientOnly();
             }