Fix deletion of QObject from non main thread

qgis · Jun 30, 2017 · 233a861 · 233a861
1 parent 45538df
commit 233a861
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/core/qgsmaprenderertask.cpp b/src/core/qgsmaprenderertask.cpp
@@ -145,8 +145,6 @@ bool QgsMapRendererTask::run()
     annotation->render( context );
     context.painter()->restore();
   }
-  qDeleteAll( mAnnotations );
-  mAnnotations.clear();
 
   if ( !mFileName.isEmpty() )
   {
@@ -181,6 +179,9 @@ bool QgsMapRendererTask::run()
 
 void QgsMapRendererTask::finished( bool result )
 {
+  qDeleteAll( mAnnotations );
+  mAnnotations.clear();
+
   if ( result )
     emit renderingComplete();
   else