Fix deadlock when calling datasource manager dialog refresh

src/app/qgisapp.cpp

@@ -2671,7 +2671,7 @@ void QgisApp::dataSourceManager( const QString &pageName, const QString &layerUr
   if ( !mDataSourceManagerDialog )
   {
     mDataSourceManagerDialog = new QgsDataSourceManagerDialog( mBrowserModel, this, mapCanvas() );
-    connect( this, &QgisApp::connectionsChanged, mDataSourceManagerDialog, &QgsDataSourceManagerDialog::refresh );
+    connect( this, &QgisApp::connectionsChanged, mDataSourceManagerDialog, &QgsDataSourceManagerDialog::refresh, Qt::ConnectionType::QueuedConnection );
     connect( mDataSourceManagerDialog, &QgsDataSourceManagerDialog::connectionsChanged, this, &QgisApp::connectionsChanged );
 
 

src/gui/qgsdatasourcemanagerdialog.cpp

@@ -302,7 +302,7 @@ void QgsDataSourceManagerDialog::makeConnections( QgsAbstractDataSourceWidget *d
   connect( dlg, &QgsAbstractDataSourceWidget::replaceVectorLayer, this, &QgsDataSourceManagerDialog::replaceSelectedVectorLayer );
   // Common
   connect( dlg, &QgsAbstractDataSourceWidget::connectionsChanged, this, &QgsDataSourceManagerDialog::connectionsChanged );
-  connect( this, &QgsDataSourceManagerDialog::providerDialogsRefreshRequested, dlg, &QgsAbstractDataSourceWidget::refresh );
+  connect( this, &QgsDataSourceManagerDialog::providerDialogsRefreshRequested, dlg, &QgsAbstractDataSourceWidget::refresh, Qt::ConnectionType::QueuedConnection );
 
   // Message
   connect( dlg, &QgsAbstractDataSourceWidget::pushMessage, this, [=]( const QString &title, const QString &message, const Qgis::MessageLevel level ) {

src/gui/qgslayermetadatasearchwidget.cpp

@@ -82,6 +82,7 @@ QgsLayerMetadataSearchWidget::QgsLayerMetadataSearchWidget( QWidget *parent, Qt:
     if ( progress == 100 )
     {
       mIsLoading = false;
+      mReloadRequired = false;
       mProgressBar->hide();
       updateLoadBtn();
     }
@@ -90,15 +91,16 @@ QgsLayerMetadataSearchWidget::QgsLayerMetadataSearchWidget( QWidget *parent, Qt:
   connect( mAbortPushButton, &QPushButton::clicked, mSourceModel, [=]( bool ) {
     if ( !mIsLoading )
     {
-      mIsLoading = true;
       mProgressBar->show();
-      mSourceModel->reloadAsync();
+      mReloadRequired = true;
+      refresh();
     }
     else
     {
       mProgressBar->hide();
       mSourceModel->cancel();
       mIsLoading = false;
+      mReloadRequired = false;
     }
     updateLoadBtn();
   } );
@@ -181,8 +183,9 @@ void QgsLayerMetadataSearchWidget::updateExtentFilter( int index )
 
 void QgsLayerMetadataSearchWidget::refresh()
 {
-  mIsLoading = true;
-  mSourceModel->reloadAsync();
+  // Lazy reload
+  mReloadRequired = true;
+  refreshInternal();
 }
 
 void QgsLayerMetadataSearchWidget::addButtonClicked()
@@ -258,15 +261,19 @@ void QgsLayerMetadataSearchWidget::showEvent( QShowEvent *event )
 {
   QgsAbstractDataSourceWidget::showEvent( event );
   mSearchFilterLineEdit->setText( mProxyModel->filterString() );
-  // The first show event triggers the metadata loading
-  if ( !mIsInitialized )
-  {
-    refresh();
-    mIsInitialized = true;
-  }
+  refreshInternal();
 }
 
 void QgsLayerMetadataSearchWidget::showHelp()
 {
   QgsHelp::openHelp( QStringLiteral( "managing_data_source/opening_data.html#the-layer-metadata-search-panel" ) );
 }
+
+void QgsLayerMetadataSearchWidget::refreshInternal()
+{
+  if ( mReloadRequired && isVisible() )
+  {
+    mIsLoading = true;
+    mSourceModel->reloadAsync();
+  }
+}

src/gui/qgslayermetadatasearchwidget.h

@@ -59,9 +59,11 @@ class GUI_EXPORT QgsLayerMetadataSearchWidget : public QgsAbstractDataSourceWidg
   private:
     QgsLayerMetadataResultsProxyModel *mProxyModel = nullptr;
     bool mIsLoading = false;
-    bool mIsInitialized = false;
+    bool mReloadRequired = true;
     QgsLayerMetadataResultsModel *mSourceModel = nullptr;
 
+    void refreshInternal();
+
     // QWidget interface
   protected:
     void showEvent( QShowEvent *event ) override;