Update qgsvectorlayereditbuffer.cpp

qgis · Apr 18, 2013 · a6e2fc1 · a6e2fc1
1 parent f8834f2
commit a6e2fc1
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/core/qgsvectorlayereditbuffer.cpp b/src/core/qgsvectorlayereditbuffer.cpp
@@ -99,8 +99,15 @@ bool QgsVectorLayerEditBuffer::addFeature( QgsFeature& f )
   {
     return false;
   }
-
-  int layerFieldCount = L->dataProvider()->fields().count() + mAddedAttributes.count() - mDeletedAttributeIds.count();
+  int layerFieldJoinCount=0;
+  for ( int i = 0; i < L->mUpdatedFields.count(); ++i )
+  {
+      if ( L->mUpdatedFields.fieldOrigin(i)==QgsFields::OriginJoin )
+    {
+        layerFieldJoinCount++;
+    }
+  }
+  int layerFieldCount = L->dataProvider()->fields().count() + layerFieldJoinCount + mAddedAttributes.count() - mDeletedAttributeIds.count();int layerFieldCount = L->dataProvider()->fields().count() + mAddedAttributes.count() - mDeletedAttributeIds.count();
   if ( layerFieldCount != f.attributes().count() )
     return false;