From b7d288271517f2e4cba77ddfae0d0c4c0b3cd1c7 Mon Sep 17 00:00:00 2001
From: Laszlo Agocs <laszlo.agocs@digia.com>
Date: Tue, 15 Oct 2013 12:49:45 +0200
Subject: [PATCH] linuxfb: Do not crash with GL windows

We will show an error message saying no platform context is available
but the crash (due to GL windows having a null backingstore) is not
desirable.

Change-Id: Iba3a61bfc4eeeb89b4a0017a58c87a7dbd0895e7
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
---
 src/platformsupport/fbconvenience/qfbscreen.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/platformsupport/fbconvenience/qfbscreen.cpp b/src/platformsupport/fbconvenience/qfbscreen.cpp
index 4ef035cf50..37d16ddeb6 100644
--- a/src/platformsupport/fbconvenience/qfbscreen.cpp
+++ b/src/platformsupport/fbconvenience/qfbscreen.cpp
@@ -258,8 +258,9 @@ QRegion QFbScreen::doRedraw()
                     QRect windowRect = mWindowStack[layerIndex]->geometry().translated(-screenOffset);
                     QRect windowIntersect = rect.translated(-windowRect.left(),
                                                             -windowRect.top());
-                    mCompositePainter->drawImage(rect, mWindowStack[layerIndex]->backingStore()->image(),
-                                                windowIntersect);
+                    QFbBackingStore *backingStore = mWindowStack[layerIndex]->backingStore();
+                    if (backingStore)
+                        mCompositePainter->drawImage(rect, backingStore->image(), windowIntersect);
                     if (firstLayer) {
                         firstLayer = false;
                     }