From 2a186f29f4e5fd31b7ac2aa9eb2701d190259eb5 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Sat, 20 Feb 2016 12:57:38 +0100
Subject: Core/Networking: Close the instance socket acceptor on shutdown

---
 src/server/game/Server/WorldSocketMgr.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp
index 94c5a8f6979..4f42e943245 100644
--- a/src/server/game/Server/WorldSocketMgr.cpp
+++ b/src/server/game/Server/WorldSocketMgr.cpp
@@ -49,7 +49,7 @@ WorldSocketMgr::WorldSocketMgr() : BaseSocketMgr(), _instanceAcceptor(nullptr),
 
 WorldSocketMgr::~WorldSocketMgr()
 {
-    delete _instanceAcceptor;
+    ASSERT(!_instanceAcceptor, "StopNetwork must be called prior to WorldSocketMgr destruction");
 }
 
 bool WorldSocketMgr::StartNetwork(boost::asio::io_service& service, std::string const& bindIp, uint16 port)
@@ -85,8 +85,12 @@ bool WorldSocketMgr::StartNetwork(boost::asio::io_service& service, std::string
 
 void WorldSocketMgr::StopNetwork()
 {
+    _instanceAcceptor->Close();
     BaseSocketMgr::StopNetwork();
 
+    delete _instanceAcceptor;
+    _instanceAcceptor = nullptr;
+
     sScriptMgr->OnNetworkStop();
 }
 
-- 
cgit v1.2.3