attribute dialog: keep clone feature until destruction (fixes crash f…

…rom action menu)
qgis · Oct 29, 2014 · f9fcee9 · f9fcee9
1 parent f831475
commit f9fcee9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/gui/qgsattributedialog.cpp b/src/gui/qgsattributedialog.cpp
@@ -28,6 +28,7 @@
 QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer* vl, QgsFeature* thepFeature, bool featureOwner, QgsDistanceArea myDa, QWidget* parent, bool showDialogButtons )
     : QDialog( parent )
     , mHighlight( 0 )
+    , mOwnedFeature( featureOwner ? thepFeature : 0 )
 {
   QgsAttributeEditorContext context;
   context.setDistanceArea( myDa );
@@ -36,22 +37,17 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer* vl, QgsFeature* thepFeat
 
   if ( !showDialogButtons )
     mAttributeForm->hideButtonBox();
-
-  if ( featureOwner )
-    delete thepFeature;
 }
 
 QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer* vl, QgsFeature* thepFeature, bool featureOwner, QWidget* parent, bool showDialogButtons, QgsAttributeEditorContext context )
     : QDialog( parent )
     , mHighlight( 0 )
+    , mOwnedFeature( featureOwner ? thepFeature : 0 )
 {
   init( vl, thepFeature, context, parent );
 
   if ( !showDialogButtons )
     mAttributeForm->hideButtonBox();
-
-  if ( featureOwner )
-    delete thepFeature;
 }
 
 QgsAttributeDialog::~QgsAttributeDialog()
@@ -62,6 +58,9 @@ QgsAttributeDialog::~QgsAttributeDialog()
     delete mHighlight;
   }
 
+  if( mOwnedFeature )
+    delete mOwnedFeature;
+
   saveGeometry();
 }
 

diff --git a/src/gui/qgsattributedialog.h b/src/gui/qgsattributedialog.h
@@ -136,6 +136,7 @@ class GUI_EXPORT QgsAttributeDialog : public QDialog
     QString mReturnvarname;
     QgsAttributeForm* mAttributeForm;
     QMenuBar* mMenuBar;
+    QgsFeature *mOwnedFeature;
 
     // true if this dialog is editable
     bool mEditable;