Additional guard against endless update loop

opengisch · Oct 19, 2022 · db90b04 · db90b04 · qfield-fairy · Oct 19, 2022
1 parent e881622
commit db90b04
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/core/attributeformmodelbase.cpp b/src/core/attributeformmodelbase.cpp
@@ -479,7 +479,7 @@ void AttributeFormModelBase::flatten( QgsAttributeEditorContainer *container, QS
   }
 }
 
-void AttributeFormModelBase::updateDefaultValues( int fieldIndex )
+void AttributeFormModelBase::updateDefaultValues( int fieldIndex, QVector<int> updatedFields )
 {
   const QgsFields fields = mFeatureModel->feature().fields();
   if ( fieldIndex < 0 || fieldIndex >= fields.size() )
@@ -511,7 +511,11 @@ void AttributeFormModelBase::updateDefaultValues( int fieldIndex )
     if ( success && updatedValue != previousValue )
     {
       item->setData( defaultValue, AttributeFormModel::AttributeValue );
-      updateDefaultValues( fidx );
+      if ( !updatedFields.contains( fidx ) )
+      {
+        updatedFields.append( fidx );
+        updateDefaultValues( fidx, updatedFields );
+      }
       updateVisibilityAndConstraints( fidx );
     }
   }

diff --git a/src/core/attributeformmodelbase.h b/src/core/attributeformmodelbase.h
@@ -81,7 +81,7 @@ class AttributeFormModelBase : public QStandardItemModel
 
     void flatten( QgsAttributeEditorContainer *container, QStandardItem *parent, const QString &parentVisibilityExpressions, QVector<QStandardItem *> &items, int currentTabIndex = 0, const QColor &color = QColor() );
 
-    void updateDefaultValues( int fieldIndex = -1 );
+    void updateDefaultValues( int fieldIndex = -1, QVector<int> updatedFields = QVector<int>() );
 
     void updateVisibilityAndConstraints( int fieldIndex = -1 );