summaryrefslogtreecommitdiffstats
path: root/src/render/framegraph
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2015-09-30 10:57:34 +0200
committerPaul Lemire <paul.lemire@kdab.com>2015-10-14 16:00:07 +0000
commitb2f3a21ceb9d69340a6bc0b9d98b5952fa634b99 (patch)
treec6a52806f9790dba869a9895e5e81c2d1a2157d0 /src/render/framegraph
parent82e6469fa24147d5a20128ff62bed58eb9028278 (diff)
QFrameGraph: check that activeFrameGraph is not null
Otherwise we try to set the parent on a null object Change-Id: I0dff1a8374dd1540bddb109b112ea73081db0f39 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
Diffstat (limited to 'src/render/framegraph')
-rw-r--r--src/render/framegraph/qframegraph.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/framegraph/qframegraph.cpp b/src/render/framegraph/qframegraph.cpp
index b8357f396..a6193a4c9 100644
--- a/src/render/framegraph/qframegraph.cpp
+++ b/src/render/framegraph/qframegraph.cpp
@@ -131,7 +131,7 @@ void QFrameGraph::setActiveFrameGraph(QFrameGraphNode *activeFrameGraph)
Q_D(QFrameGraph);
if (activeFrameGraph != d->m_activeFrameGraph) {
- if (!activeFrameGraph->parent())
+ if (activeFrameGraph != Q_NULLPTR && !activeFrameGraph->parent())
activeFrameGraph->setParent(this);
d->m_activeFrameGraph = activeFrameGraph;