charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 02:50:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: NetworkManager.StopServer/StopClient: avoid NullReferenceException when called in OnApplicationQuit or from tests

Browse Source
This commit is contained in:
vis2k 2021-03-06 14:04:37 +08:00
parent 425e3131dc
commit 25ece5a0d5
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Assets/Mirror/Runtime/NetworkManager.cs
View File

@ -646,7 +646,10 @@ public void StopServer()
// Get Network Manager out of DDOL before going to offline scene
// to avoid collision and let a fresh Network Manager be created.
if (gameObject.scene.name == "DontDestroyOnLoad"
// IMPORTANT: .gameObject can be null if StopClient is called from
// OnApplicationQuit or from tests!
if (gameObject != null &&
gameObject.scene.name == "DontDestroyOnLoad"
&& !string.IsNullOrEmpty(offlineScene)
&& SceneManager.GetActiveScene().path != offlineScene)
SceneManager.MoveGameObjectToScene(gameObject, SceneManager.GetActiveScene());
@ -684,7 +687,10 @@ public void StopClient()
// Get Network Manager out of DDOL before going to offline scene
// to avoid collision and let a fresh Network Manager be created.
if (gameObject.scene.name == "DontDestroyOnLoad"
// IMPORTANT: .gameObject can be null if StopClient is called from
// OnApplicationQuit or from tests!
if (gameObject != null &&
gameObject.scene.name == "DontDestroyOnLoad"
&& !string.IsNullOrEmpty(offlineScene)
&& SceneManager.GetActiveScene().path != offlineScene)
SceneManager.MoveGameObjectToScene(gameObject, SceneManager.GetActiveScene());