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