Parse capabilities immediately

m-kuhn · m-kuhn · commit 666a0e99b484 · 2018-06-14T09:52:27.000+02:00
... even when the request is sent in a different thread.
diff --git a/src/providers/wfs/qgswfscapabilities.cpp b/src/providers/wfs/qgswfscapabilities.cpp
@@ -30,7 +30,11 @@
 QgsWfsCapabilities::QgsWfsCapabilities( const QString &uri )
   : QgsWfsRequest( QgsWFSDataSourceURI( uri ) )
 {
-  connect( this, &QgsWfsRequest::downloadFinished, this, &QgsWfsCapabilities::capabilitiesReplyFinished );
+  // Using Qt::DirectConnection since the download might be running on a different thread.
+  // In this case, the request was sent from the main thread and is executed with the main
+  // thread being blocked in future.waitForFinished() so we can run code on this object which
+  // lives in the main thread without risking havoc.
+  connect( this, &QgsWfsRequest::downloadFinished, this, &QgsWfsCapabilities::capabilitiesReplyFinished, Qt::DirectConnection );
 }
 
 bool QgsWfsCapabilities::requestCapabilities( bool synchronous, bool forceRefresh )

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,11 @@`
`30`	`30`	`QgsWfsCapabilities::QgsWfsCapabilities( const QString &uri )`
`31`	`31`	`: QgsWfsRequest( QgsWFSDataSourceURI( uri ) )`
`32`	`32`	`{`
`33`		`- connect( this, &QgsWfsRequest::downloadFinished, this, &QgsWfsCapabilities::capabilitiesReplyFinished );`
	`33`	`+ // Using Qt::DirectConnection since the download might be running on a different thread.`
	`34`	`+ // In this case, the request was sent from the main thread and is executed with the main`
	`35`	`+ // thread being blocked in future.waitForFinished() so we can run code on this object which`
	`36`	`+ // lives in the main thread without risking havoc.`
	`37`	`+ connect( this, &QgsWfsRequest::downloadFinished, this, &QgsWfsCapabilities::capabilitiesReplyFinished, Qt::DirectConnection );`
`34`	`38`	`}`
`35`	`39`
`36`	`40`	`bool QgsWfsCapabilities::requestCapabilities( bool synchronous, bool forceRefresh )`