Avoid recursion in feature filter model

qgis · Oct 30, 2017 · a3eadd320f28249915db54a02bbde9140327c6e3 · a3eadd3
1 parent 1d21072
commit a3eadd320f28249915db54a02bbde9140327c6e3
Unified Split

Showing with 3 additions and 3 deletions.

+3 −3 src/core/qgsfeaturefiltermodel.cpp
diff --git a/src/core/qgsfeaturefiltermodel.cpp b/src/core/qgsfeaturefiltermodel.cpp
@@ -379,8 +379,8 @@ void QgsFeatureFilterModel::setExtraIdentifierValueUnguarded( const QVariant &ex
       mEntries.prepend( Entry( QVariant( QVariant::Int ), QStringLiteral( "%1" ).arg( tr( "NULL" ) ) ) );
     else
       mEntries.prepend( Entry( extraIdentifierValue, QStringLiteral( "(%1)" ).arg( extraIdentifierValue.toString() ) ) );
-    endInsertRows();
     setExtraIdentifierValueIndex( 0 );
+    endInsertRows();
 
     reloadCurrentFeature();
   }
@@ -447,11 +447,11 @@ QVariant QgsFeatureFilterModel::extraIdentifierValue() const
 
 void QgsFeatureFilterModel::setExtraIdentifierValue( const QVariant &extraIdentifierValue )
 {
-  if ( extraIdentifierValue == mExtraIdentifierValue && extraIdentifierValue.isNull() == mExtraIdentifierValue.isNull() && mExtraIdentifierValue.isValid() )
+  if ( extraIdentifierValue == mExtraIdentifierValue && extraIdentifierValue.isNull() == mExtraIdentifierValue.isNull() && mExtraIdentifierValue.isValid() == extraIdentifierValue.isValid() )
     return;
 
+  mExtraIdentifierValue = extraIdentifierValue;
   setExtraIdentifierValueUnguarded( extraIdentifierValue );
 
-  mExtraIdentifierValue = extraIdentifierValue;
   emit extraIdentifierValueChanged();
 }