Merge pull request #8228 from pblottiere/server_deadlock

pblottiere · web-flow · commit dfb28fed4473 · 2018-10-22T13:21:11.000+01:00
[server] Fixes freeze of server during rendering
diff --git a/src/server/services/wms/qgsmaprendererjobproxy.cpp b/src/server/services/wms/qgsmaprendererjobproxy.cpp
@@ -56,6 +56,13 @@ namespace QgsWms
       renderJob.setFeatureFilterProvider( mFeatureFilterProvider );
 #endif
       renderJob.start();
+
+      // Allows the main thread to manage blocking call coming from rendering
+      // threads (see discussion in https://issues.qgis.org/issues/18988).
+      QEventLoop loop;
+      QObject::connect( &renderJob, &QgsMapRendererParallelJob::finished, &loop, &QEventLoop::quit );
+      loop.exec();
+
       renderJob.waitForFinished();
       *image = renderJob.renderedImage();
       mPainter.reset( new QPainter( image ) );
