don't use last used values on primary key fields (fixes #14154)

qgis · Jan 21, 2016 · fdeff63 · fdeff63
1 parent 4d2c108
commit fdeff63
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/app/qgsfeatureaction.cpp b/src/app/qgsfeatureaction.cpp
@@ -135,6 +135,7 @@ bool QgsFeatureAction::addFeature( const QgsAttributeMap& defaultAttributes, boo
     return false;
 
   QgsVectorDataProvider *provider = mLayer->dataProvider();
+  QgsAttributeList pkAttrList = mLayer->pkAttributeList();
 
   QSettings settings;
   bool reuseLastValues = settings.value( "/qgis/digitizing/reuseLastValues", false ).toBool();
@@ -151,7 +152,7 @@ bool QgsFeatureAction::addFeature( const QgsAttributeMap& defaultAttributes, boo
     {
       v = defaultAttributes.value( idx );
     }
-    else if ( reuseLastValues && sLastUsedValues.contains( mLayer ) && sLastUsedValues[ mLayer ].contains( idx ) )
+    else if ( reuseLastValues && sLastUsedValues.contains( mLayer ) && sLastUsedValues[ mLayer ].contains( idx ) && !pkAttrList.contains( idx ) )
     {
       v = sLastUsedValues[ mLayer ][idx];
     }