Implement: If a queued object gets deleted, remove it from the queue.

Change-Id: Ibe9902e2a884b844898a88544fed809d3c7f5eeb
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

1 files changed, 8 insertions, 0 deletions

diff --git a/src/serialbus/qmodbusrtuserialmaster_p.h b/src/serialbus/qmodbusrtuserialmaster_p.h
index 88644de..578169f 100644
--- a/src/serialbus/qmodbusrtuserialmaster_p.h
+++ b/src/serialbus/qmodbusrtuserialmaster_p.h
@@ -259,6 +259,14 @@ public:
         QModbusReply *reply = new QModbusReply(type, slaveAddress, q);
         m_queue.enqueue(QueueElement{ reply, request, unit, m_numberOfRetries });
 
+        q->connect(reply, &QObject::destroyed, q, [this](QObject *obj) {
+            foreach (const QueueElement &element, m_queue) {
+                if (element.reply != obj)
+                    continue;
+                m_queue.removeAll(element);
+                QTimer::singleShot(0, [this]() { sendNextRequest(); });
+            }
+        });
         if (!m_responseTimer || (!m_responseTimer->isActive()))
             sendNextRequest();