Second attempt at fixing crash on node tool after merge

Sandro Santilli · Sandro Santilli · commit 24a9f491812a · 2016-02-01T18:14:24.000+01:00
See #14188
diff --git a/src/app/nodetool/qgsselectedfeature.cpp b/src/app/nodetool/qgsselectedfeature.cpp
@@ -78,7 +78,10 @@ void QgsSelectedFeature::updateGeometry( QgsGeometry *geom )
   {
     QgsFeature f;
     mVlayer->getFeatures( QgsFeatureRequest().setFilterFid( mFeatureId ) ).nextFeature( f );
-    mGeometry = f.geometry() ? new QgsGeometry( *f.geometry() ) : nullptr;
+    if ( f.geometry() )
+      mGeometry = new QgsGeometry( *f.geometry() );
+    else
+      mGeometry = new QgsGeometry();
   }
   else
   {

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,10 @@ void QgsSelectedFeature::updateGeometry( QgsGeometry *geom )`
`78`	`78`	`{`
`79`	`79`	`QgsFeature f;`
`80`	`80`	`mVlayer->getFeatures( QgsFeatureRequest().setFilterFid( mFeatureId ) ).nextFeature( f );`
`81`		`- mGeometry = f.geometry() ? new QgsGeometry( *f.geometry() ) : nullptr;`
	`81`	`+ if ( f.geometry() )`
	`82`	`+ mGeometry = new QgsGeometry( *f.geometry() );`
	`83`	`+ else`
	`84`	`+ mGeometry = new QgsGeometry();`
`82`	`85`	`}`
`83`	`86`	`else`
`84`	`87`	`{`