Fix crashes when accessing null map layer renderer

(obviously cached layers have null renderer) Thanks @nyalldawson for tracking it down
qgis · Aug 4, 2016 · 23909a1 · 23909a1
1 parent 669ac1b
commit 23909a1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/core/qgsmaprenderercustompainterjob.cpp b/src/core/qgsmaprenderercustompainterjob.cpp
@@ -125,7 +125,7 @@ void QgsMapRendererCustomPainterJob::cancel()
   for ( LayerRenderJobs::iterator it = mLayerJobs.begin(); it != mLayerJobs.end(); ++it )
   {
     it->context.setRenderingStopped( true );
-    if ( it->renderer->feedback() )
+    if ( it->renderer && it->renderer->feedback() )
       it->renderer->feedback()->cancel();
   }
 

diff --git a/src/core/qgsmaprendererparalleljob.cpp b/src/core/qgsmaprendererparalleljob.cpp
@@ -92,7 +92,7 @@ void QgsMapRendererParallelJob::cancel()
   for ( LayerRenderJobs::iterator it = mLayerJobs.begin(); it != mLayerJobs.end(); ++it )
   {
     it->context.setRenderingStopped( true );
-    if ( it->renderer->feedback() )
+    if ( it->renderer && it->renderer->feedback() )
       it->renderer->feedback()->cancel();
   }