mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-18 22:07:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't grab lock in increment_it if we are deleting cuz we will hang

Browse Source
This commit is contained in:
Isaac Connor
2021-04-17 11:35:41 -04:00
parent 96deedfd53
commit 5ab9a48599
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/zm_packetqueue.cpp
View File

@@ -577,7 +577,7 @@ void PacketQueue::unlock(ZMLockedPacket *lp) {
bool PacketQueue::increment_it(packetqueue_iterator *it) {
Debug(2, "Incrementing %p, queue size %d, end? %d", it, pktQueue.size(), ((*it) == pktQueue.end()));
if ((*it) == pktQueue.end()) {
if ((*it) == pktQueue.end() or deleting) {
return false;
}
std::unique_lock<std::mutex> lck(mutex);