Merge branch 'master' of github.com:ZoneMinder/zoneminder

This commit is contained in:
Isaac Connor 2022-02-20 10:32:43 -05:00
commit 02ccf13c7b
1 changed files with 7 additions and 2 deletions

View File

@ -238,8 +238,13 @@ zmDbQueue::~zmDbQueue() {
}
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();
}