Followup 90f381, fix memory leaks when rendering canvas

qgis · Apr 1, 2017 · 9838a8f · 9838a8f
1 parent 22cf49d
commit 9838a8f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/core/qgsmaprendererparalleljob.cpp b/src/core/qgsmaprendererparalleljob.cpp
@@ -141,7 +141,7 @@ void QgsMapRendererParallelJob::cancelWithoutBlocking()
   if ( mStatus == RenderingLayers )
   {
     disconnect( &mFutureWatcher, SIGNAL( finished() ), this, SLOT( renderLayersFinished() ) );
-    connect( &mFutureWatcher, SIGNAL( finished() ), this, SLOT( renderingFinished() ) );
+    connect( &mFutureWatcher, SIGNAL( finished() ), this, SLOT( renderLayersFinishedWhenJobCanceled() ) );
   }
 }
 
@@ -306,3 +306,11 @@ void QgsMapRendererParallelJob::renderLabelsStatic( QgsMapRendererParallelJob* s
   painter.end();
 }
 
+void QgsMapRendererParallelJob::renderLayersFinishedWhenJobCanceled()
+{
+  logRenderingTime( mLayerJobs );
+
+  cleanupJobs( mLayerJobs );
+  renderingFinished();
+}
+
diff --git a/src/core/qgsmaprendererparalleljob.h b/src/core/qgsmaprendererparalleljob.h
@@ -74,6 +74,10 @@ class CORE_EXPORT QgsMapRendererParallelJob : public QgsMapRendererQImageJob
     QgsRenderContext mLabelingRenderContext;
     QFuture<void> mLabelingFuture;
     QFutureWatcher<void> mLabelingFutureWatcher;
+
+  private slots:
+
+    void renderLayersFinishedWhenJobCanceled();
 };