fix: Revert "fix: Cleanup after PR #3935"

MirrorNetworking · Dec 3, 2024 · fc7ec09 · fc7ec09
1 parent 9e737e0
commit fc7ec09
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/Assets/Mirror/Transports/Edgegap/EdgegapLobby/EdgegapLobbyKcpTransport.cs b/Assets/Mirror/Transports/Edgegap/EdgegapLobby/EdgegapLobbyKcpTransport.cs
@@ -323,7 +323,7 @@ public void SetServerLobbyParams(LobbyCreateRequest request)
             _request = request;
         }
 
-        public override void OnDestroy()
+        private void OnDestroy()
         {
             // attempt to clean up lobbies, if active
             if (NetworkServer.active)
@@ -340,8 +340,6 @@ public override void OnDestroy()
                 // sorry. this can go once the lobby service can timeout lobbies itself
                 Thread.Sleep(300);
             }
-
-            base.OnDestroy();
         }
     }
 }
diff --git a/Assets/Mirror/Transports/Threaded/ThreadedTransport.cs b/Assets/Mirror/Transports/Threaded/ThreadedTransport.cs
@@ -197,10 +197,11 @@ void EnsureThread()
             Debug.Log($"ThreadedTransport: started worker thread!");
         }
 
-        public override void OnDestroy()
+        protected virtual void OnDestroy()
         {
             // stop thread fully
-            base.OnDestroy();
+            Shutdown();
+
             // TODO recycle writers.
         }
 

diff --git a/Assets/ScriptTemplates/50-Mirror__Network Manager-NewNetworkManager.cs.txt b/Assets/ScriptTemplates/50-Mirror__Network Manager-NewNetworkManager.cs.txt
@@ -68,6 +68,14 @@ public class #SCRIPTNAME# : NetworkManager
         base.ConfigureHeadlessFrameRate();
     }
 
+    /// <summary>
+    /// called when quitting the application by closing the window / pressing stop in the editor
+    /// </summary>
+    public override void OnApplicationQuit()
+    {
+        base.OnApplicationQuit();
+    }
+
     #endregion
 
     #region Scene Management

diff --git a/...riptTemplates/51-Mirror__Network Manager With Actions-NewNetworkManagerWithActions.cs.txt b/...riptTemplates/51-Mirror__Network Manager With Actions-NewNetworkManagerWithActions.cs.txt
@@ -15,6 +15,8 @@ public class #SCRIPTNAME# : NetworkManager
     public event Action OnStartAction;
     public event Action OnDestroyAction;
 
+    public event Action OnApplicationQuitAction;
+
     public event Action<string> ServerChangeSceneAction;
     public event Action<string> OnServerChangeSceneAction;
     public event Action<string> OnServerSceneChangedAction;
@@ -115,6 +117,15 @@ public class #SCRIPTNAME# : NetworkManager
         base.ConfigureHeadlessFrameRate();
     }
 
+    /// <summary>
+    /// called when quitting the application by closing the window / pressing stop in the editor
+    /// </summary>
+    public override void OnApplicationQuit()
+    {
+        OnApplicationQuitAction?.Invoke();
+        base.OnApplicationQuit();
+    }
+
     #endregion
 
     #region Scene Management