浏览代码

Fix crash on closing client while server is active

Ivan Savenko 1 年之前
父节点
当前提交
74f9b03516
共有 1 个文件被更改,包括 5 次插入0 次删除
  1. 5 0
      client/CServerHandler.cpp

+ 5 - 0
client/CServerHandler.cpp

@@ -108,9 +108,14 @@ public:
 
 CServerHandler::~CServerHandler()
 {
+	if (serverRunner)
+		serverRunner->shutdown();
 	networkHandler->stop();
 	try
 	{
+		if (serverRunner)
+			serverRunner->wait();
+		serverRunner.reset();
 		threadNetwork.join();
 	}
 	catch (const std::runtime_error & e)