Skip to content
Permalink
Browse files

[refFunctions] fix deadlocks

  • Loading branch information
olivierdalang committed Sep 10, 2020
1 parent 723a6ef commit 9d27a537af7044d2ef48303022c7c0314d72c989
Showing with 4 additions and 1 deletion.
  1. +4 −1 src/core/expression/qgsexpressionfunction.cpp
@@ -5689,6 +5689,10 @@ static QVariant executeGeomOverlay( const QVariantList &values, const QgsExpress
const QVariant sourceLayerRef = context->variable( QStringLiteral( "layer" ) ); //used to detect if sourceLayer and targetLayer are the same
QgsVectorLayer *sourceLayer = QgsExpressionUtils::getVectorLayer( sourceLayerRef, parent );

QgsFeatureRequest request;
request.setTimeout( 10000 );
request.setRequestMayBeNested( true );

// First parameter is the overlay layer
QgsExpressionNode *node = QgsExpressionUtils::getNode( values.at( 0 ), parent );
ENSURE_NO_EVAL_ERROR
@@ -5711,7 +5715,6 @@ static QVariant executeGeomOverlay( const QVariantList &values, const QgsExpress
}

// Third parameter is the filtering expression
QgsFeatureRequest request; // TODO only required attributes
node = QgsExpressionUtils::getNode( values.at( 2 ), parent );
ENSURE_NO_EVAL_ERROR
QString filterString = node->dump();

0 comments on commit 9d27a53

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