Merge remote-tracking branch 'origin/5.9' into dev

Change-Id: I4ceccd338a937a2ada231f568ed02c7a87bd6e80

1 files changed, 30 insertions, 0 deletions

diff --git a/src/render/framegraph/qrendercapture.cpp b/src/render/framegraph/qrendercapture.cpp
index ff0a5c739..66c518506 100644
--- a/src/render/framegraph/qrendercapture.cpp
+++ b/src/render/framegraph/qrendercapture.cpp
@@ -41,6 +41,7 @@
 #include <Qt3DRender/qframegraphnodecreatedchange.h>
 
 #include <QPointer>
+#include <QMutexLocker>
 
 QT_BEGIN_NAMESPACE
 
@@ -240,8 +241,19 @@ QRenderCapturePrivate::QRenderCapturePrivate()
 /*!
  * \internal
  */
+QRenderCapturePrivate::~QRenderCapturePrivate()
+{
+    Q_Q(QRenderCapture);
+    for (QRenderCaptureReply *reply : m_waitingReplies)
+        reply->disconnect(q);
+}
+
+/*!
+ * \internal
+ */
 QRenderCaptureReply *QRenderCapturePrivate::createReply(int captureId)
 {
+    QMutexLocker lock(&m_mutex);
     QRenderCaptureReply *reply = new QRenderCaptureReply();
     reply->d_func()->m_captureId = captureId;
     m_waitingReplies.push_back(reply);
@@ -254,6 +266,7 @@ QRenderCaptureReply *QRenderCapturePrivate::createReply(int captureId)
 QRenderCaptureReply *QRenderCapturePrivate::takeReply(int captureId)
 {
     QRenderCaptureReply *reply = nullptr;
+    QMutexLocker lock(&m_mutex);
     for (int i = 0; i < m_waitingReplies.size(); ++i) {
         if (m_waitingReplies[i]->d_func()->m_captureId == captureId) {
             reply = m_waitingReplies[i];
@@ -274,6 +287,15 @@ void QRenderCapturePrivate::setImage(QRenderCaptureReply *reply, const QImage &i
 }
 
 /*!
+ * \internal
+ */
+void QRenderCapturePrivate::replyDestroyed(QRenderCaptureReply *reply)
+{
+    QMutexLocker lock(&m_mutex);
+    m_waitingReplies.removeAll(reply);
+}
+
+/*!
  * The constructor creates an instance with the specified \a parent.
  */
 QRenderCapture::QRenderCapture(Qt3DCore::QNode *parent)
@@ -293,6 +315,10 @@ QRenderCaptureReply *QRenderCapture::requestCapture(int captureId, const QRect &
 {
     Q_D(QRenderCapture);
     QRenderCaptureReply *reply = d->createReply(captureId);
+    reply->setParent(this);
+    QObject::connect(reply, &QObject::destroyed, this, [&, reply, d] (QObject *) {
+        d->replyDestroyed(reply);
+    });
 
     Qt3DCore::QPropertyUpdatedChangePtr change(new Qt3DCore::QPropertyUpdatedChange(id()));
     change->setPropertyName(QByteArrayLiteral("renderCaptureRequest"));
@@ -314,6 +340,10 @@ QRenderCaptureReply *QRenderCapture::requestCapture(const QRect &rect)
     Q_D(QRenderCapture);
     static int captureId = 1;
     QRenderCaptureReply *reply = d->createReply(captureId);
+    reply->setParent(this);
+    QObject::connect(reply, &QObject::destroyed, this, [&, reply, d] (QObject *) {
+        d->replyDestroyed(reply);
+    });
 
     Qt3DCore::QPropertyUpdatedChangePtr change(new Qt3DCore::QPropertyUpdatedChange(id()));
     change->setPropertyName(QByteArrayLiteral("renderCaptureRequest"));