Check we remove a valid node when removing from node properties

Change-Id: Ibcc4d9bfd9d0a9d7697151915f24a6eecc149f6d
Reviewed-by: Mike Krus <mike.krus@kdab.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/src/render/framegraph/qrenderpassfilter.cpp b/src/render/framegraph/qrenderpassfilter.cpp
index 952657eb6..34462ebdf 100644
--- a/src/render/framegraph/qrenderpassfilter.cpp
+++ b/src/render/framegraph/qrenderpassfilter.cpp
@@ -151,8 +151,9 @@ void QRenderPassFilter::removeMatch(QFilterKey *filterKey)
     Q_ASSERT(filterKey);
     Q_D(QRenderPassFilter);
 
+    if (!d->m_matchList.removeOne(filterKey))
+        return;
     d->updateNode(filterKey, "match", Qt3DCore::PropertyValueRemoved);
-    d->m_matchList.removeOne(filterKey);
     // Remove bookkeeping connection
     d->unregisterDestructionHelper(filterKey);
 }
@@ -189,8 +190,9 @@ void QRenderPassFilter::removeParameter(QParameter *parameter)
     Q_ASSERT(parameter);
     Q_D(QRenderPassFilter);
 
+    if (!d->m_parameters.removeOne(parameter))
+        return;
     d->updateNode(parameter, "parameter", Qt3DCore::PropertyValueRemoved);
-    d->m_parameters.removeOne(parameter);
     // Remove bookkeeping connection
     d->unregisterDestructionHelper(parameter);
 }