Fix missing initial render of composer maps

nyalldawson · nyalldawson · commit 7f1a07487ae0 · 2017-03-21T11:51:34.000+10:00
diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp
@@ -295,10 +295,8 @@ void QgsComposerMap::paint( QPainter *painter, const QStyleOptionGraphicsItem *,
   }
   else if ( mComposition->plotStyle() == QgsComposition::Preview )
   {
-    //draw cached pixmap. This function does not call cache() any more because
-    //Qt 4.4.0 and 4.4.1 have problems with recursive paintings
-    //QgsComposerMap::cache() and QgsComposerMap::update() need to be called by
-    //client functions
+    if ( mCacheImage.isNull() )
+      cache();
 
     //Background color is already included in cached image, so no need to draw
 

Original file line number	Diff line number	Diff line change
`@@ -295,10 +295,8 @@ void QgsComposerMap::paint( QPainter painter, const QStyleOptionGraphicsItem ,`
`295`	`295`	`}`
`296`	`296`	`else if ( mComposition->plotStyle() == QgsComposition::Preview )`
`297`	`297`	`{`
`298`		`- //draw cached pixmap. This function does not call cache() any more because`
`299`		`- //Qt 4.4.0 and 4.4.1 have problems with recursive paintings`
`300`		`- //QgsComposerMap::cache() and QgsComposerMap::update() need to be called by`
`301`		`- //client functions`
	`298`	`+ if ( mCacheImage.isNull() )`
	`299`	`+ cache();`
`302`	`300`
`303`	`301`	`//Background color is already included in cached image, so no need to draw`
`304`	`302`