3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-07-03 09:47:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

fixed crash in case of ZeroConf name collision

Browse source
This commit is contained in:
badaix 2015-05-24 15:10:46 +02:00
parent 52b0e92a5c
commit 94ee70d0af
3 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
server/serverSession.cpp
View file

@ -16,10 +16,10 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#include "serverSession.h"
#include <boost/lexical_cast.hpp>
#include <iostream>
#include <mutex>
#include "serverSession.h"
#include "common/log.h"
using namespace std;
@ -69,7 +69,7 @@ void ServerSession::stop()
}
if (writerThread_)
{
logD << "joining readerThread\n";
logD << "joining writerThread\n";
writerThread_->join();
delete writerThread_;
}
@ -155,7 +155,7 @@ void ServerSession::reader()
}
catch (const std::exception& e)
{
logS(kLogErr) << "Exception: " << e.what() << ", trying to reconnect" << endl;
logS(kLogErr) << "Exception in ServerSession::reader(): " << e.what() << endl;
}
active_ = false;
}
@ -176,9 +176,9 @@ void ServerSession::writer()
send(message.get());
}
}
catch (std::exception& e)
catch (const std::exception& e)
{
logE << "Exception in thread: " << e.what() << "\n";
logS(kLogErr) << "Exception in ServerSession::writer(): " << e.what() << endl;
}
active_ = false;
}