Fix crash when deleting last node in a geometry (fix #13674)

nyalldawson · nyalldawson · commit ba1de8b5aa82 · 2015-10-29T17:01:38.000+11:00
diff --git a/src/app/nodetool/qgsmaptoolnodetool.cpp b/src/app/nodetool/qgsmaptoolnodetool.cpp
@@ -539,7 +539,15 @@ void QgsMapToolNodeTool::keyPressEvent( QKeyEvent* e )
       return;
 
     mSelectedFeature->deleteSelectedVertexes();
-    safeSelectVertex( firstSelectedIndex );
+
+    if ( mSelectedFeature->geometry()->isEmpty() )
+    {
+      emit messageEmitted( tr( "Geometry has been cleared. Use the add part tool to set geometry for this feature." ) );
+    }
+    else
+    {
+      safeSelectVertex( firstSelectedIndex );
+    }
     mCanvas->refresh();
 
     // Override default shortcut management in MapCanvas
diff --git a/src/core/qgsvectorlayereditutils.cpp b/src/core/qgsvectorlayereditutils.cpp
@@ -103,6 +103,13 @@ bool QgsVectorLayerEditUtils::deleteVertex( QgsFeatureId atFeatureId, int atVert
   if ( !geometry.deleteVertex( atVertex ) )
     return false;
 
+  if ( geometry.geometry() && geometry.geometry()->nCoordinates() == 0 )
+  {
+    //last vertex deleted, set geometry to null
+    geometry.setGeometry( 0 );
+  }
+
+
   L->editBuffer()->changeGeometry( atFeatureId, &geometry );
   return true;
 }
