[wfs] Avoid widget access from non main thread

It's not safe to loop through the app's widgets in a background thread, so defer determination of the main window until the progress dialog is being created in the main thread (cherry-picked from 291224e)
qgis · Aug 16, 2018 · 491095c · 491095c
1 parent 01b4ede
commit 491095c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 11 deletions.
diff --git a/src/providers/wfs/qgswfsfeatureiterator.cpp b/src/providers/wfs/qgswfsfeatureiterator.cpp
@@ -155,9 +155,28 @@ void QgsWFSFeatureDownloader::hideProgressDialog()
 // Called from GUI thread
 void QgsWFSFeatureDownloader::createProgressDialog()
 {
+  Q_ASSERT( qApp->thread() == QThread::currentThread() );
+
   if ( mStop )
     return;
   Q_ASSERT( !mProgressDialog );
+
+  if ( !mMainWindow )
+  {
+    const QWidgetList widgets = qApp->topLevelWidgets();
+    for ( QWidget *widget : widgets )
+    {
+      if ( widget->objectName() == QLatin1String( "QgisApp" ) )
+      {
+        mMainWindow = widget;
+        break;
+      }
+    }
+  }
+
+  if ( !mMainWindow )
+    return;
+
   mProgressDialog = new QgsWFSProgressDialog( tr( "Loading features for layer %1" ).arg( mShared->mURI.typeName() ),
       tr( "Abort" ), 0, mNumberMatched, mMainWindow );
   mProgressDialog->setWindowTitle( tr( "QGIS" ) );
@@ -425,17 +444,10 @@ void QgsWFSFeatureDownloader::run( bool serializeFeatures, int maxFeatures )
 
   if ( !mShared->mHideProgressDialog && maxFeatures != 1 && mShared->supportsHits() )
   {
-    Q_FOREACH ( QWidget *widget, qApp->topLevelWidgets() )
-    {
-      if ( widget->objectName() == QLatin1String( "QgisApp" ) )
-      {
-        mMainWindow = widget;
-        break;
-      }
-    }
+    mUseProgressDialog = true;
   }
 
-  if ( mMainWindow )
+  if ( mUseProgressDialog )
   {
     // In case the header of the GetFeature response doesn't contain the total
     // number of features, or we don't get it within 4 seconds, we will issue
@@ -550,7 +562,7 @@ void QgsWFSFeatureDownloader::run( bool serializeFeatures, int maxFeatures )
 
       // Consider if we should display a progress dialog
       // We can only do that if we know how many features will be downloaded
-      if ( !mTimer && maxFeatures != 1 && mMainWindow )
+      if ( !mTimer && maxFeatures != 1 && mUseProgressDialog )
       {
         if ( mNumberMatched < 0 )
         {
@@ -586,7 +598,7 @@ void QgsWFSFeatureDownloader::run( bool serializeFeatures, int maxFeatures )
           // thread of this
           connect( mTimer, &QTimer::timeout, this, &QgsWFSFeatureDownloader::createProgressDialog, Qt::DirectConnection );
 
-          mTimer->moveToThread( mMainWindow->thread() );
+          mTimer->moveToThread( qApp->thread() );
           QMetaObject::invokeMethod( mTimer, "start", Qt::QueuedConnection );
         }
       }

diff --git a/src/providers/wfs/qgswfsfeatureiterator.h b/src/providers/wfs/qgswfsfeatureiterator.h
@@ -153,6 +153,7 @@ class QgsWFSFeatureDownloader: public QgsWfsRequest
     bool mSupportsPaging;
     bool mRemoveNSPrefix;
     int mNumberMatched;
+    bool mUseProgressDialog = false;
     QWidget *mMainWindow = nullptr;
     QTimer *mTimer = nullptr;
     QgsWFSFeatureHitsAsyncRequest mFeatureHitsAsyncRequest;