From 24a9f491812a3a044c28a4406a24764504d792db Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 1 Feb 2016 18:14:24 +0100
Subject: [PATCH] Second attempt at fixing crash on node tool after merge

See #14188
---
 src/app/nodetool/qgsselectedfeature.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/app/nodetool/qgsselectedfeature.cpp b/src/app/nodetool/qgsselectedfeature.cpp
index 7a83bfd3620b..fe2868a907e1 100644
--- 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
   {