diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2020-02-10 07:59:56 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2020-02-10 10:44:52 +0100 |
| commit | 547b0b00244f1535eab4456a02b75b46776eae51 (patch) | |
| tree | 899a4c4f5e2c0cdc1d8de6613c431c25b09f8424 /src/render/materialsystem/qtechnique.cpp | |
| parent | 648b7459e8a6ce8ce1f115a14da63d546b743439 (diff) | |
Check we remove a valid node when removing from node properties
Change-Id: Ibcc4d9bfd9d0a9d7697151915f24a6eecc149f6d
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src/render/materialsystem/qtechnique.cpp')
| -rw-r--r-- | src/render/materialsystem/qtechnique.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/render/materialsystem/qtechnique.cpp b/src/render/materialsystem/qtechnique.cpp index a9b7ca82b..0e1787938 100644 --- a/src/render/materialsystem/qtechnique.cpp +++ b/src/render/materialsystem/qtechnique.cpp @@ -269,8 +269,9 @@ void QTechnique::removeFilterKey(QFilterKey *filterKey) { Q_ASSERT(filterKey); Q_D(QTechnique); + if (!d->m_filterKeys.removeOne(filterKey)) + return; d->updateNode(filterKey, "filterKeys", Qt3DCore::PropertyValueRemoved); - d->m_filterKeys.removeOne(filterKey); // Remove bookkeeping connection d->unregisterDestructionHelper(filterKey); } @@ -316,8 +317,9 @@ void QTechnique::removeParameter(QParameter *parameter) { Q_ASSERT(parameter); Q_D(QTechnique); + if (!d->m_parameters.removeOne(parameter)) + return; d->updateNode(parameter, "parameter", Qt3DCore::PropertyValueRemoved); - d->m_parameters.removeOne(parameter); // Remove bookkeeping connection d->unregisterDestructionHelper(parameter); } @@ -353,8 +355,9 @@ void QTechnique::removeRenderPass(QRenderPass *pass) { Q_ASSERT(pass); Q_D(QTechnique); + if (!d->m_renderPasses.removeOne(pass)) + return; d->updateNode(pass, "pass", Qt3DCore::PropertyValueAdded); - d->m_renderPasses.removeOne(pass); // Remove bookkeeping connection d->unregisterDestructionHelper(pass); } |