Skip to content

Commit bb6ca62

Browse files
committed
Fixed null ref on shutdown
1 parent 33d39b4 commit bb6ca62

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -696,10 +696,13 @@ public void Shutdown()
696696
IsClient = false;
697697
NetworkConfig.NetworkTransport.OnTransportEvent -= HandleRawTransportPoll;
698698

699-
SpawnManager.DestroyNonSceneObjects();
700-
SpawnManager.ServerResetShudownStateForSceneObjects();
699+
if (SpawnManager != null)
700+
{
701+
SpawnManager.DestroyNonSceneObjects();
702+
SpawnManager.ServerResetShudownStateForSceneObjects();
701703

702-
SpawnManager = null;
704+
SpawnManager = null;
705+
}
703706

704707
//The Transport is set during Init time, thus it is possible for the Transport to be null
705708
NetworkConfig?.NetworkTransport?.Shutdown();

0 commit comments

Comments
 (0)