Run canvas preview jobs sequentially

Only start the next job when the previous one has completely finished. Avoids flooding connection pools with too many quick requests.
qgis · Dec 4, 2017 · 91c9130 · 91c9130
1 parent 01e8ed8
commit 91c9130
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -634,6 +634,13 @@ void QgsMapCanvas::previewJobFinished()
   {
     mMap->addPreviewImage( job->renderedImage(), job->mapSettings().extent() );
     mPreviewJobs.removeAll( job );
+
+    int number = job->property( "number" ).toInt();
+    if ( number < 8 )
+    {
+      startPreviewJob( number + 1 );
+    }
+
     delete job;
   }
 }
@@ -2289,14 +2296,10 @@ void QgsMapCanvas::startPreviewJob( int number )
   jobSettings.setLayers( previewLayers );
 
   QgsMapRendererQImageJob *job = new QgsMapRendererSequentialJob( jobSettings );
+  job->setProperty( "number", number );
   mPreviewJobs.append( job );
   connect( job, &QgsMapRendererJob::finished, this, &QgsMapCanvas::previewJobFinished );
   job->start();
-
-  if ( number < 8 )
-  {
-    schedulePreviewJob( number + 1 );
-  }
 }
 
 void QgsMapCanvas::stopPreviewJobs()