don't try to add attributes twice, if some attribute change fails

jef · jef · commit 4ca70cca965b · 2008-03-12T09:57:45.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8208 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgsattributetable.cpp b/src/app/qgsattributetable.cpp
@@ -441,6 +441,10 @@ bool QgsAttributeTable::commitChanges(QgsVectorLayer* layer)
       {
         // add new attributes beforehand, so attribute changes can be applied
         isSuccessful = layer->commitAttributeChanges(QgsAttributeIds(), mAddedAttributes, QgsChangedAttributesMap());
+
+        if(isSuccessful)
+          // forget added attributes on successful addition
+          mAddedAttributes.clear();
       }
 
       if(isSuccessful)

Original file line number	Diff line number	Diff line change
`@@ -441,6 +441,10 @@ bool QgsAttributeTable::commitChanges(QgsVectorLayer* layer)`
`441`	`441`	`{`
`442`	`442`	`// add new attributes beforehand, so attribute changes can be applied`
`443`	`443`	`isSuccessful = layer->commitAttributeChanges(QgsAttributeIds(), mAddedAttributes, QgsChangedAttributesMap());`
	`444`	`+`
	`445`	`+ if(isSuccessful)`
	`446`	`+ // forget added attributes on successful addition`
	`447`	`+ mAddedAttributes.clear();`
`444`	`448`	`}`
`445`	`449`
`446`	`450`	`if(isSuccessful)`