Skip to content
Permalink
Browse files

Immediately liberate connection of expression value gatherer

  • Loading branch information
github-actions authored and nyalldawson committed Jul 2, 2020
1 parent be4820f commit c84ecac1aa536bd0ea2ba961f6c0c22892aa50db
Showing with 2 additions and 3 deletions.
  1. +2 −3 src/core/qgsfeatureexpressionvaluesgatherer.h
@@ -91,7 +91,7 @@ class QgsFeatureExpressionValuesGatherer: public QThread
{
mWasCanceled = false;

mIterator = mSource->getFeatures( mRequest );
QgsFeatureIterator iterator = mSource->getFeatures( mRequest );

mDisplayExpression.prepare( &mExpressionContext );

@@ -100,7 +100,7 @@ class QgsFeatureExpressionValuesGatherer: public QThread
for ( const QString &fieldName : qgis::as_const( mIdentifierFields ) )
attributeIndexes << mSource->fields().indexOf( fieldName );

while ( mIterator.nextFeature( feature ) )
while ( iterator.nextFeature( feature ) )
{
mExpressionContext.setFeature( feature );
QVariantList attributes;
@@ -165,7 +165,6 @@ class QgsFeatureExpressionValuesGatherer: public QThread
QgsExpression mDisplayExpression;
QgsExpressionContext mExpressionContext;
QgsFeatureRequest mRequest;
QgsFeatureIterator mIterator;
bool mWasCanceled = false;
mutable QMutex mCancelMutex;
QStringList mIdentifierFields;

0 comments on commit c84ecac

Please sign in to comment.
You can’t perform that action at this time.