keep add feature action until non-modal attribute form is closed (fixes #11461)

jef-n · jef-n · commit b5f047d2d37e · 2014-10-22T00:25:39.000+02:00
diff --git a/src/app/qgsfeatureaction.cpp b/src/app/qgsfeatureaction.cpp
@@ -192,18 +192,17 @@ bool QgsFeatureAction::addFeature( const QgsAttributeMap& defaultAttributes, boo
     dialog->setIsAddDialog( true );
     dialog->setEditCommandMessage( text() );
 
-    connect( dialog->attributeForm(), SIGNAL( featureSaved( QgsFeature ) ), this, SLOT( onFeatureSaved( QgsFeature ) ) );
+    connect( dialog->attributeForm(), SIGNAL( featureSaved( const QgsFeature & ) ), this, SLOT( onFeatureSaved( const QgsFeature & ) ) );
 
-    if ( showModal )
-    {
-      dialog->setAttribute( Qt::WA_DeleteOnClose );
-      dialog->exec();
-    }
-    else
+    if ( !showModal )
     {
+      setParent( dialog ); // keep dialog until the dialog is closed and destructed
       dialog->show(); // will also delete the dialog on close (show() is overridden)
       return true;
     }
+
+    dialog->setAttribute( Qt::WA_DeleteOnClose );
+    dialog->exec();
   }
 
   // Will be set in the onFeatureSaved SLOT
diff --git a/src/app/qgsmaptooladdfeature.cpp b/src/app/qgsmaptooladdfeature.cpp
@@ -42,8 +42,11 @@ QgsMapToolAddFeature::~QgsMapToolAddFeature()
 
 bool QgsMapToolAddFeature::addFeature( QgsVectorLayer *vlayer, QgsFeature *f, bool showModal )
 {
-  QgsFeatureAction action( tr( "add feature" ), *f, vlayer, -1, -1, this );
-  return action.addFeature( QgsAttributeMap(), showModal );
+  QgsFeatureAction *action = new QgsFeatureAction( tr( "add feature" ), *f, vlayer, -1, -1, this );
+  bool res = action->addFeature( QgsAttributeMap(), showModal );
+  if ( showModal )
+    delete action;
+  return res;
 }
 
 void QgsMapToolAddFeature::activate()

Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,11 @@ QgsMapToolAddFeature::~QgsMapToolAddFeature()`
`42`	`42`
`43`	`43`	`bool QgsMapToolAddFeature::addFeature( QgsVectorLayer vlayer, QgsFeature f, bool showModal )`
`44`	`44`	`{`
`45`		`- QgsFeatureAction action( tr( "add feature" ), *f, vlayer, -1, -1, this );`
`46`		`- return action.addFeature( QgsAttributeMap(), showModal );`
	`45`	`+ QgsFeatureAction action = new QgsFeatureAction( tr( "add feature" ), f, vlayer, -1, -1, this );`
	`46`	`+ bool res = action->addFeature( QgsAttributeMap(), showModal );`
	`47`	`+ if ( showModal )`
	`48`	`+ delete action;`
	`49`	`+ return res;`
`47`	`50`	`}`
`48`	`51`
`49`	`52`	`void QgsMapToolAddFeature::activate()`