Wait for network threads in destructor.

Thanks to Chero.
vmangos · Nov 6, 2024 · 82b57df · 82b57df
1 parent 286eb7b
commit 82b57df
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/src/framework/Network/MangosSocketMgrImpl.h b/src/framework/Network/MangosSocketMgrImpl.h
@@ -240,6 +240,8 @@ MangosSocketMgr<SocketType>::MangosSocketMgr():
 template <typename SocketType>
 MangosSocketMgr<SocketType>::~MangosSocketMgr()
 {
+    Wait();
+
     delete [] m_NetThreads;
     delete m_Acceptor;
 }
@@ -305,11 +307,6 @@ void MangosSocketMgr<SocketType>::StopNetwork()
         for (size_t i = 0; i < m_NetThreadsCount; ++i)
             m_NetThreads[i].Stop();
     }
-
-    // Avoid hanging on shutdown on some unix systems.
-#ifdef _WIN32
-    Wait();
-#endif
 }
 
 template <typename SocketType>