Fix rare crash on map canvas deletion

qgis · Mar 29, 2017 · 55d0ad7 · 55d0ad7
1 parent 1c202e7
commit 55d0ad7
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -198,6 +198,14 @@ QgsMapCanvas::~QgsMapCanvas()
   }
   mLastNonZoomMapTool = nullptr;
 
+  // rendering job may still end up writing into canvas map item
+  // so kill it before deleting canvas items
+  if ( mJob )
+  {
+    whileBlocking( mJob )->cancel();
+    Q_ASSERT( !mJob );
+  }
+
   // delete canvas items prior to deleting the canvas
   // because they might try to update canvas when it's
   // already being destructed, ends with segfault
@@ -215,12 +223,6 @@ QgsMapCanvas::~QgsMapCanvas()
   // mCanvasProperties auto-deleted via QScopedPointer
   // CanvasProperties struct has its own dtor for freeing resources
 
-  if ( mJob )
-  {
-    whileBlocking( mJob )->cancel();
-    delete mJob;
-  }
-
   delete mCache;
 
   delete mLabelingResults;