aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Johan Sorvig <morten.sorvig@nokia.com>2012-01-05 10:14:52 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-05 12:08:56 +0100
commitc582499370743d4c6d23baa1c839193e531d8a45 (patch)
treefe9af9bacc295462399255ea28dc01b4a2f63794
parentc738512a571827e6070a10e4ee2f345ff5e7ff10 (diff)
Fix crash on null Qimage in QSGPainterNode::paint
Creating a QPainter on a null image is not allowed, return early if this is the case. Change-Id: I56f30c0fd84eefc1676d6b980f77269abace07ce Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
-rw-r--r--src/quick/scenegraph/util/qsgpainternode.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quick/scenegraph/util/qsgpainternode.cpp b/src/quick/scenegraph/util/qsgpainternode.cpp
index 640aab967e..2ce42fcc4d 100644
--- a/src/quick/scenegraph/util/qsgpainternode.cpp
+++ b/src/quick/scenegraph/util/qsgpainternode.cpp
@@ -154,6 +154,9 @@ void QSGPainterNode::paint()
{
QRect dirtyRect = m_dirtyRect.isNull() ? QRect(0, 0, m_size.width(), m_size.height()) : m_dirtyRect;
+ if (m_image.isNull())
+ return;
+
QPainter painter;
if (m_actualRenderTarget == QQuickPaintedItem::Image)
painter.begin(&m_image);