Fix rendering regression

In parallel rendering, make sure mFinalImage exists before drawing labels.
qgis · Dec 17, 2019 · d6ee3ed · d6ee3ed
1 parent 5d8899b
commit d6ee3ed
Showing 1 changed file with 19 additions and 1 deletion.
diff --git a/src/core/qgsmaprendererparalleljob.cpp b/src/core/qgsmaprendererparalleljob.cpp
@@ -228,6 +228,12 @@ void QgsMapRendererParallelJob::renderLayersFinished()
     }
   }
 
+  // compose final image for labeling
+  if ( mSecondPassLayerJobs.isEmpty() )
+  {
+    mFinalImage = composeImage( mSettings, mLayerJobs, mLabelJob );
+  }
+
   QgsDebugMsgLevel( QStringLiteral( "PARALLEL layers finished" ), 2 );
 
   if ( mSettings.testFlag( QgsMapSettings::DrawLabeling ) && !mLabelJob.context.renderingStopped() )
@@ -284,7 +290,19 @@ void QgsMapRendererParallelJob::renderingFinished()
   }
   else
   {
-    renderLayersSecondPassFinished();
+    QgsDebugMsgLevel( QStringLiteral( "PARALLEL finished" ), 2 );
+
+    logRenderingTime( mLayerJobs, mSecondPassLayerJobs, mLabelJob );
+
+    cleanupJobs( mLayerJobs );
+
+    cleanupLabelJob( mLabelJob );
+
+    mStatus = Idle;
+
+    mRenderingTime = mRenderingStart.elapsed();
+
+    emit finished();
   }
 }