From 5561041c70f5cdc56562d5508fdcfd5e44355145 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 16 Jan 2026 12:11:42 -0500
Subject: [PATCH] Add a lambda to prevent spurious wakeups

---
 src/zm_packetqueue.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/zm_packetqueue.cpp b/src/zm_packetqueue.cpp
index 20dd57609..afc3f893d 100644
--- a/src/zm_packetqueue.cpp
+++ b/src/zm_packetqueue.cpp
@@ -336,6 +336,7 @@ void PacketQueue::clearPackets(const std::shared_ptr<ZMPacket> &add_packet) {
   while (*it != add_packet) {
     zm_packet = *it;
     {
+      // We are only locking it to see if anyone else is messing with it.
       ZMPacketLock packet_lock(zm_packet);
       if (!packet_lock.trylock()) {
         Debug(3, "Failed locking packet %d", zm_packet->image_index);
@@ -476,7 +477,7 @@ ZMPacketLock PacketQueue::get_packet_no_wait(packetqueue_iterator *it) {
     return ZMPacketLock();
   if ((*it == pktQueue.end()) and !(deleting or zm_terminate)) {
     Debug(2, "waiting.  Queue size %zu it == end? %d", pktQueue.size(), (*it == pktQueue.end()));
-    condition.wait(lck);
+    condition.wait(lck, [&]{ return (*it != pktQueue.end()) || deleting || zm_terminate; });
   }
   if ((*it == pktQueue.end()) or deleting or zm_terminate) return ZMPacketLock();