3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-06-14 16:51:43 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix server crash on control client disconnect (quit, exit, bye)

Browse source
This commit is contained in:
Johannes Pohl 2017-06-06 22:45:28 +02:00
parent fa9715684b
commit b56d656c32
3 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
server/controlSession.cpp
View file

@ -45,8 +45,8 @@ void ControlSession::start()
std::lock_guard<std::recursive_mutex> activeLock(activeMutex_);
active_ = true;
}
readerThread_ = new thread(&ControlSession::reader, this);
writerThread_ = new thread(&ControlSession::writer, this);
readerThread_ = thread(&ControlSession::reader, this);
writerThread_ = thread(&ControlSession::writer, this);
}
@ -66,25 +66,21 @@ void ControlSession::stop()
socket_->close(ec);
if (ec) logE << "Error in socket close: " << ec.message() << "\n";
}
if (readerThread_)
if (readerThread_.joinable())
{
logD << "joining readerThread\n";
readerThread_->join();
delete readerThread_;
readerThread_.join();
}
if (writerThread_)
if (writerThread_.joinable())
{
logD << "joining writerThread\n";
messages_.abort_wait();
writerThread_->join();
delete writerThread_;
writerThread_.join();
}
}
catch(...)
{
}
readerThread_ = NULL;
writerThread_ = NULL;
socket_ = NULL;
logD << "ControlSession stopped\n";
}