From 40465ca6854cc4371762d362bdfd88398793189b Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Mon, 29 Sep 2014 21:06:58 +1000
Subject: [PATCH] [composer] Prevent more Qt warnings for html item

---
 src/core/composer/qgscomposerhtml.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/core/composer/qgscomposerhtml.cpp b/src/core/composer/qgscomposerhtml.cpp
index 593fc25c8976..f353ea38249d 100644
--- a/src/core/composer/qgscomposerhtml.cpp
+++ b/src/core/composer/qgscomposerhtml.cpp
@@ -245,6 +245,10 @@ void QgsComposerHtml::renderCachedImage()
     delete mRenderedPage;
   }
   mRenderedPage = new QImage( mWebPage->viewportSize(), QImage::Format_ARGB32 );
+  if ( mRenderedPage->isNull() )
+  {
+    return;
+  }
   QPainter painter;
   painter.begin( mRenderedPage );
   mWebPage->mainFrame()->render( &painter );