Revert "attribute dialog: keep clone feature until destruction (fixes crash from action"

m-kuhn · m-kuhn · commit f618cae5e8a9 · 2014-10-29T13:53:42.000+01:00
This reverts commit f9fcee9.
diff --git a/src/gui/qgsattributedialog.cpp b/src/gui/qgsattributedialog.cpp
@@ -28,7 +28,6 @@
 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 );
@@ -37,17 +36,22 @@ 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()
@@ -58,9 +62,6 @@ QgsAttributeDialog::~QgsAttributeDialog()
     delete mHighlight;
   }
 
-  if( mOwnedFeature )
-    delete mOwnedFeature;
-
   saveGeometry();
 }
 
diff --git a/src/gui/qgsattributedialog.h b/src/gui/qgsattributedialog.h
@@ -136,7 +136,6 @@ class GUI_EXPORT QgsAttributeDialog : public QDialog
     QString mReturnvarname;
     QgsAttributeForm* mAttributeForm;
     QMenuBar* mMenuBar;
-    QgsFeature *mOwnedFeature;
 
     // true if this dialog is editable
     bool mEditable;

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@`
`28`	`28`	`QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer* vl, QgsFeature* thepFeature, bool featureOwner, QgsDistanceArea myDa, QWidget* parent, bool showDialogButtons )`
`29`	`29`	`: QDialog( parent )`
`30`	`30`	`, mHighlight( 0 )`
`31`		`- , mOwnedFeature( featureOwner ? thepFeature : 0 )`
`32`	`31`	`{`
`33`	`32`	`QgsAttributeEditorContext context;`
`34`	`33`	`context.setDistanceArea( myDa );`
`@@ -37,17 +36,22 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer* vl, QgsFeature* thepFeat`
`37`	`36`
`38`	`37`	`if ( !showDialogButtons )`
`39`	`38`	`mAttributeForm->hideButtonBox();`
	`39`	`+`
	`40`	`+ if ( featureOwner )`
	`41`	`+ delete thepFeature;`
`40`	`42`	`}`
`41`	`43`
`42`	`44`	`QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer* vl, QgsFeature* thepFeature, bool featureOwner, QWidget* parent, bool showDialogButtons, QgsAttributeEditorContext context )`
`43`	`45`	`: QDialog( parent )`
`44`	`46`	`, mHighlight( 0 )`
`45`		`- , mOwnedFeature( featureOwner ? thepFeature : 0 )`
`46`	`47`	`{`
`47`	`48`	`init( vl, thepFeature, context, parent );`
`48`	`49`
`49`	`50`	`if ( !showDialogButtons )`
`50`	`51`	`mAttributeForm->hideButtonBox();`
	`52`	`+`
	`53`	`+ if ( featureOwner )`
	`54`	`+ delete thepFeature;`
`51`	`55`	`}`
`52`	`56`
`53`	`57`	`QgsAttributeDialog::~QgsAttributeDialog()`
`@@ -58,9 +62,6 @@ QgsAttributeDialog::~QgsAttributeDialog()`
`58`	`62`	`delete mHighlight;`
`59`	`63`	`}`
`60`	`64`
`61`		`- if( mOwnedFeature )`
`62`		`- delete mOwnedFeature;`
`63`		`-`
`64`	`65`	`saveGeometry();`
`65`	`66`	`}`
`66`	`67`