Immediately liberate connection of expression value gatherer

This fixes a deadlock The iterator as a member as previously implemented kept connections occupied for as long as the gatherer existed. This could lead to a situation, where all connections have been reserved from finished gatherers which were waiting to be deleted (through deleteLater), but deleteLater would never happen because the main thread was waiting for a connection to become available. Fixes #37496
qgis · Jul 2, 2020 · 4904344 · 4904344
1 parent b1e3845
commit 4904344
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/core/qgsfeaturefiltermodel_p.h b/src/core/qgsfeaturefiltermodel_p.h
@@ -52,7 +52,7 @@ class QgsFieldExpressionValuesGatherer: public QThread
     {
       mWasCanceled = false;
 
-      mIterator = mSource->getFeatures( mRequest );
+      QgsFeatureIterator iterator = mSource->getFeatures( mRequest );
 
       mDisplayExpression.prepare( &mExpressionContext );
 
@@ -61,7 +61,7 @@ class QgsFieldExpressionValuesGatherer: public QThread
       for ( const QString &fieldName : qgis::as_const( mIdentifierFields ) )
         attributeIndexes << mSource->fields().indexOf( fieldName );
 
-      while ( mIterator.nextFeature( feat ) )
+      while ( iterator.nextFeature( feat ) )
       {
         mExpressionContext.setFeature( feat );
         QVariantList attributes;
@@ -121,7 +121,6 @@ class QgsFieldExpressionValuesGatherer: public QThread
     QgsExpression mDisplayExpression;
     QgsExpressionContext mExpressionContext;
     QgsFeatureRequest mRequest;
-    QgsFeatureIterator mIterator;
     bool mWasCanceled = false;
     mutable QMutex mCancelMutex;
     QVector<QgsFeatureFilterModel::Entry> mEntries;