From 547b0b00244f1535eab4456a02b75b46776eae51 Mon Sep 17 00:00:00 2001
From: Paul Lemire <paul.lemire@kdab.com>
Date: Mon, 10 Feb 2020 07:59:56 +0100
Subject: Check we remove a valid node when removing from node properties

Change-Id: Ibcc4d9bfd9d0a9d7697151915f24a6eecc149f6d
Reviewed-by: Mike Krus <mike.krus@kdab.com>
---
 src/render/framegraph/qrenderstateset.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/render/framegraph/qrenderstateset.cpp')

diff --git a/src/render/framegraph/qrenderstateset.cpp b/src/render/framegraph/qrenderstateset.cpp
index 5341b3c7d..ac82954c8 100644
--- a/src/render/framegraph/qrenderstateset.cpp
+++ b/src/render/framegraph/qrenderstateset.cpp
@@ -203,8 +203,9 @@ void QRenderStateSet::removeRenderState(QRenderState *state)
     Q_ASSERT(state);
     Q_D(QRenderStateSet);
 
+    if (!d->m_renderStates.removeOne(state))
+        return;
     d->updateNode(state, "renderState", Qt3DCore::PropertyValueRemoved);
-    d->m_renderStates.removeOne(state);
     // Remove bookkeeping connection
     d->unregisterDestructionHelper(state);
 }
-- 
cgit v1.2.3