Keep selection if exchanging ids for added features, safety check for…

… 0 geometry in splitFeatures method
qgis · May 30, 2013 · 4c02d7f · 4c02d7f
1 parent 15539f3
commit 4c02d7f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/core/qgsvectorlayereditbuffer.cpp b/src/core/qgsvectorlayereditbuffer.cpp
@@ -386,6 +386,12 @@ bool QgsVectorLayerEditBuffer::commitChanges( QStringList& commitErrors )
           {
             if ( featuresToAdd[i].id() != ids[i] )
             {
+              //update selection
+              if ( L->mSelectedFeatureIds.contains( ids[i] ) )
+              {
+                L->mSelectedFeatureIds.remove( ids[i] );
+                L->mSelectedFeatureIds.insert( featuresToAdd[i].id() );
+              }
               emit featureDeleted( ids[i] );
               emit featureAdded( featuresToAdd[i].id() );
             }

diff --git a/src/core/qgsvectorlayereditutils.cpp b/src/core/qgsvectorlayereditutils.cpp
@@ -224,6 +224,10 @@ int QgsVectorLayerEditUtils::splitFeatures( const QList<QgsPoint>& splitLine, bo
   QgsFeatureList::iterator select_it = featureList.begin();
   for ( ; select_it != featureList.end(); ++select_it )
   {
+    if ( !select_it->geometry() )
+    {
+      continue;
+    }
     QList<QgsGeometry*> newGeometries;
     QList<QgsPoint> topologyTestPoints;
     QgsGeometry* newGeometry = 0;