Close the dialog before opening error message box

qgis · Jun 7, 2021 · 65a50af · 65a50af
1 parent 5729958
commit 65a50af
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/gui/qgsnewauxiliarylayerdialog.cpp b/src/gui/qgsnewauxiliarylayerdialog.cpp
@@ -46,17 +46,19 @@ void QgsNewAuxiliaryLayerDialog::accept()
 
   if ( idx >= 0 )
   {
-    QString errorMsg;
     const QgsField field = mLayer->fields().field( idx );
-    QgsAuxiliaryLayer *alayer = QgsProject::instance()->auxiliaryStorage()->createAuxiliaryLayer( field, mLayer, &errorMsg );
+    QgsAuxiliaryLayer *alayer = QgsProject::instance()->auxiliaryStorage()->createAuxiliaryLayer( field, mLayer );
 
     if ( alayer )
     {
       mLayer->setAuxiliaryLayer( alayer );
     }
     else
     {
-      QMessageBox::critical( this, tr( "New Auxiliary Layer" ), errorMsg );
+      QDialog::close();
+      const QString errMsg = QgsProject::instance()->auxiliaryStorage()->errorString();
+      QMessageBox::critical( this, tr( "New Auxiliary Layer" ), errMsg );
+      return;
     }
   }