[QgsActionMenu] fix return feature

3nids · 3nids · commit aa95ae4cd0a5 · 2014-09-16T11:51:17.000+02:00
diff --git a/src/gui/qgsactionmenu.cpp b/src/gui/qgsactionmenu.cpp
@@ -51,7 +51,7 @@ void QgsActionMenu::init()
 
 const QgsFeature* QgsActionMenu::feature()
 {
-  if ( !mFeature )
+  if ( !mFeature || !mFeature->isValid() )
   {
     QgsFeature* feat = new QgsFeature();
     if ( mActions->layer()->getFeatures( QgsFeatureRequest( mFeatureId ) ).nextFeature( *feat ) )

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ void QgsActionMenu::init()`
`51`	`51`
`52`	`52`	`const QgsFeature* QgsActionMenu::feature()`
`53`	`53`	`{`
`54`		`- if ( !mFeature )`
	`54`	`+ if ( !mFeature \|\| !mFeature->isValid() )`
`55`	`55`	`{`
`56`	`56`	`QgsFeature* feat = new QgsFeature();`
`57`	`57`	`if ( mActions->layer()->getFeatures( QgsFeatureRequest( mFeatureId ) ).nextFeature( *feat ) )`