Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Avoid recursion in feature filter model
- Loading branch information
Showing
with
3 additions
and
3 deletions.
-
+3
−3
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(); |
|
|
} |