QgsOgrProvider::deleteFeatures(): restore previous (odd) behaviour re…

…garding shapefiles and feature count
qgis · Oct 17, 2020 · 4cf40fb · 4cf40fb
1 parent 87f0b2b
commit 4cf40fb
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/src/core/providers/ogr/qgsogrprovider.cpp b/src/core/providers/ogr/qgsogrprovider.cpp
@@ -2709,13 +2709,21 @@ bool QgsOgrProvider::deleteFeatures( const QgsFeatureIds &id )
     returnvalue = false;
   }
 
-  if ( mFeaturesCounted != QgsVectorDataProvider::Uncounted &&
-       mFeaturesCounted != QgsVectorDataProvider::UnknownCount )
+  if ( mGDALDriverName == QLatin1String( "ESRI Shapefile" ) )
   {
-    if ( returnvalue )
-      mFeaturesCounted -= id.size();
-    else
-      recalculateFeatureCount();
+    // Shapefile behaves in a special way due to possible recompaction
+    recalculateFeatureCount();
+  }
+  else
+  {
+    if ( mFeaturesCounted != QgsVectorDataProvider::Uncounted &&
+         mFeaturesCounted != QgsVectorDataProvider::UnknownCount )
+    {
+      if ( returnvalue )
+        mFeaturesCounted -= id.size();
+      else
+        recalculateFeatureCount();
+    }
   }
 
   clearMinMaxCache();