mirror of
https://github.com/ZoneMinder/zoneminder.git
synced 2026-03-26 09:42:42 -04:00
Don't join in Stop methods. THe decode and analysis thread may never get woken up from packetqueue. Leave it for the destructor.
This commit is contained in:
@@ -10,6 +10,7 @@ DecoderThread::DecoderThread(Monitor *monitor) :
|
||||
|
||||
DecoderThread::~DecoderThread() {
|
||||
Stop();
|
||||
if (thread_.joinable()) thread_.join();
|
||||
}
|
||||
|
||||
void DecoderThread::Start() {
|
||||
@@ -20,7 +21,6 @@ void DecoderThread::Start() {
|
||||
|
||||
void DecoderThread::Stop() {
|
||||
terminate_ = true;
|
||||
if (thread_.joinable()) thread_.join();
|
||||
}
|
||||
|
||||
void DecoderThread::Run() {
|
||||
|
||||
Reference in New Issue
Block a user