ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't join in Stop methods. THe decode and analysis thread may never get woken up from packetqueue. Leave it for the destructor.

pull/3195/merge
Isaac Connor 2024-10-26 13:33:26 -04:00
parent c51c287c01
commit 0d03266455
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/zm_analysis_thread.cpp
View File

@ -11,6 +11,7 @@ AnalysisThread::AnalysisThread(Monitor *monitor) :
AnalysisThread::~AnalysisThread() {
Stop();
if (thread_.joinable()) thread_.join();
}
void AnalysisThread::Start() {
@ -22,7 +23,6 @@ void AnalysisThread::Start() {
void AnalysisThread::Stop() {
terminate_ = true;
if (thread_.joinable()) thread_.join();
}
void AnalysisThread::Run() {

2
src/zm_decoder_thread.cpp
View File

@ -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() {