3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-07-06 19:27:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

fixed exception during server shutdown

Browse source
This commit is contained in:
badaix 2016-11-06 13:15:19 +01:00
parent 748c4c06b1
commit 7353383313
5 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
server/streamreader/processStream.cpp
View file

@ -113,7 +113,10 @@ void ProcessStream::stop()
if (process_)
process_->kill();
PcmStream::stop();
stderrReaderThread_.join();
/// thread is detached, so it is not joinable
if (stderrReaderThread_.joinable())
stderrReaderThread_.join();
}
@ -181,6 +184,9 @@ void ProcessStream::worker()
}
while ((len < toRead) && active_);
if (!active_)
break;
encoder_->encode(chunk.get());
nextTick += pcmReadMs_;
chronos::addUs(tvChunk, pcmReadMs_ * 1000);
@ -202,7 +208,7 @@ void ProcessStream::worker()
}
catch(const std::exception& e)
{
logE << "Exception: " << e.what() << std::endl;
logE << "(ProcessStream) Exception: " << e.what() << std::endl;
process_->kill();
int sleepMs = 30000;
while (active_ && (sleepMs > 0))