Merge branch 'master' of github.com:ZoneMinder/zoneminder
This commit is contained in:
commit
02ccf13c7b
|
@ -238,8 +238,13 @@ zmDbQueue::~zmDbQueue() {
|
||||||
}
|
}
|
||||||
|
|
||||||
void zmDbQueue::stop() {
|
void zmDbQueue::stop() {
|
||||||
mTerminate = true;
|
{
|
||||||
mCondition.notify_all();
|
std::unique_lock<std::mutex> lock(mMutex);
|
||||||
|
|
||||||
|
mTerminate = true;
|
||||||
|
mCondition.notify_all();
|
||||||
|
}
|
||||||
|
|
||||||
if (mThread.joinable()) mThread.join();
|
if (mThread.joinable()) mThread.join();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue