don't crash on late update timeouts

jef-n · jef-n · commit 9887734a1fd4 · 2017-03-16T18:41:24.000+01:00
(cherry picked from commit 5541ad0)
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -640,8 +640,11 @@ QgsRectangle QgsMapCanvas::imageRect( const QImage &img, const QgsMapSettings &m
 
 void QgsMapCanvas::mapUpdateTimeout()
 {
-  const QImage &img = mJob->renderedImage();
-  mMap->setContent( img, imageRect( img, mSettings ) );
+  if ( mJob )
+  {
+    const QImage &img = mJob->renderedImage();
+    mMap->setContent( img, imageRect( img, mSettings ) );
+  }
 }
 
 void QgsMapCanvas::stopRendering()

Original file line number	Diff line number	Diff line change
`@@ -640,8 +640,11 @@ QgsRectangle QgsMapCanvas::imageRect( const QImage &img, const QgsMapSettings &m`
`640`	`640`
`641`	`641`	`void QgsMapCanvas::mapUpdateTimeout()`
`642`	`642`	`{`
`643`		`- const QImage &img = mJob->renderedImage();`
`644`		`- mMap->setContent( img, imageRect( img, mSettings ) );`
	`643`	`+ if ( mJob )`
	`644`	`+ {`
	`645`	`+ const QImage &img = mJob->renderedImage();`
	`646`	`+ mMap->setContent( img, imageRect( img, mSettings ) );`
	`647`	`+ }`
`645`	`648`	`}`
`646`	`649`
`647`	`650`	`void QgsMapCanvas::stopRendering()`