Cleanup rendering jobs in the main thread (fixes a crash in sequential job)

wonder-sk · wonder-sk · commit cae352b39ccc · 2014-01-06T12:42:14.000+07:00
diff --git a/src/core/qgsmaprendererjob.cpp b/src/core/qgsmaprendererjob.cpp
@@ -301,6 +301,10 @@ void QgsMapRendererCustomPainterJob::futureFinished()
   mActive = false;
   mRenderingTime = mRenderingStart.elapsed();
   qDebug("QPAINTER futureFinished");
+
+  // final cleanup
+  cleanupJobs( mLayerJobs );
+
   emit finished();
 }
 
@@ -341,9 +345,6 @@ void QgsMapRendererCustomPainterJob::doRender()
 
   }
 
-  // final cleanup
-  cleanupJobs( mLayerJobs );
-
   QgsDebugMsg( "Done rendering map layers" );
 
   if ( mSettings.testFlag( QgsMapSettings::DrawLabeling ) && !mLabelingRenderContext.renderingStopped() )
