Improved lambda capture

Even if the collection item is deleted before the action is triggered, we can still safely show the creation dialog and act on it (we just can't trigger the item refresh automatically)
qgis · Nov 4, 2019 · d8341b8 · d8341b8
1 parent cdc03e1
commit d8341b8
Showing 1 changed file with 10 additions and 12 deletions.
diff --git a/src/gui/providers/ogr/qgsgeopackageitemguiprovider.cpp b/src/gui/providers/ogr/qgsgeopackageitemguiprovider.cpp
@@ -94,20 +94,18 @@ void QgsGeoPackageItemGuiProvider::populateContextMenu( QgsDataItem *item, QMenu
     // Add table to existing DB
     QAction *actionAddTable = new QAction( tr( "Create a New Layer or Table…" ), collectionItem->parent() );
     QPointer<QgsGeoPackageCollectionItem>collectionItemPtr { collectionItem };
-    connect( actionAddTable, &QAction::triggered, actionAddTable, [ collectionItemPtr ]
+    const QString itemPath = collectionItem->path();
+    connect( actionAddTable, &QAction::triggered, actionAddTable, [ collectionItemPtr, itemPath ]
     {
-      if ( collectionItemPtr )
+      QgsNewGeoPackageLayerDialog dialog( nullptr );
+      dialog.setDatabasePath( itemPath );
+      dialog.setCrs( QgsProject::instance()->defaultCrsForNewLayers() );
+      dialog.setOverwriteBehavior( QgsNewGeoPackageLayerDialog::AddNewLayer );
+      dialog.lockDatabasePath();
+      if ( dialog.exec() == QDialog::Accepted )
       {
-        QgsNewGeoPackageLayerDialog dialog( nullptr );
-        dialog.setDatabasePath( collectionItemPtr->path() );
-        dialog.setCrs( QgsProject::instance()->defaultCrsForNewLayers() );
-        dialog.setOverwriteBehavior( QgsNewGeoPackageLayerDialog::AddNewLayer );
-        dialog.lockDatabasePath();
-        if ( dialog.exec() == QDialog::Accepted )
-        {
-          if ( collectionItemPtr )
-            collectionItemPtr->refreshConnections();
-        }
+        if ( collectionItemPtr )
+          collectionItemPtr->refreshConnections();
       }
     } );