fix: stopping null ref caused by hud stopping non-active server

MirageNet · May 23, 2021 · 8aa561a · 8aa561a
1 parent 8c490e3
commit 8aa561a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/Assets/Mirage/Components/NetworkManagerHud.cs b/Assets/Mirage/Components/NetworkManagerHud.cs
@@ -61,8 +61,11 @@ public void StartClientButtonHandler()
         public void StopButtonHandler()
         {
             SetLabel(string.Empty);
-            NetworkManager.Server.Stop();
-            NetworkManager.Client.Disconnect();
+
+            if (NetworkManager.Server.Active)
+                NetworkManager.Server.Stop();
+            if (NetworkManager.Client.Active)
+                NetworkManager.Client.Disconnect();
             OfflineSetActive();
         }
 

diff --git a/Assets/Mirage/Runtime/NetworkClient.cs b/Assets/Mirage/Runtime/NetworkClient.cs
@@ -213,6 +213,8 @@ internal void OnAuthenticated(INetworkPlayer player)
         /// </summary>
         public void Disconnect()
         {
+            // todo exit early if not active/initilzed
+
             Player?.Connection?.Disconnect();
             _disconnected?.Invoke();
             Cleanup();

diff --git a/Assets/Mirage/Runtime/NetworkServer.cs b/Assets/Mirage/Runtime/NetworkServer.cs
@@ -145,6 +145,8 @@ public class NetworkServer : MonoBehaviour, INetworkServer
         /// </summary>
         public void Stop()
         {
+            // todo exit early if not active/initilzed
+
             if (LocalClient != null)
             {
                 _onStopHost?.Invoke();