From 80d69dc984e9a888be5f402e229094f6f075d86d Mon Sep 17 00:00:00 2001
From: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Date: Mon, 30 May 2011 14:58:55 +0200
Subject: Do not scroll in QXcbWindowSurface when m_image is not yet created.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewed-by: Samuel Rødal
---
 src/plugins/platforms/xcb/qxcbwindowsurface.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/plugins/platforms/xcb/qxcbwindowsurface.cpp b/src/plugins/platforms/xcb/qxcbwindowsurface.cpp
index 7c46b3d572..ecfbddbfd4 100644
--- a/src/plugins/platforms/xcb/qxcbwindowsurface.cpp
+++ b/src/plugins/platforms/xcb/qxcbwindowsurface.cpp
@@ -258,7 +258,7 @@ extern void qt_scrollRectInImage(QImage &img, const QRect &rect, const QPoint &o
 
 bool QXcbWindowSurface::scroll(const QRegion &area, int dx, int dy)
 {
-    if (m_image->image()->isNull())
+    if (!m_image || m_image->image()->isNull())
         return false;
 
     m_image->preparePaint(area);
-- 
cgit v1.2.3