Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[processing] Correct order of expression scopes in widget wrapper exp…
…ression contexts

(cherry picked from commit 2180b63)
  • Loading branch information
nyalldawson committed Feb 12, 2019
1 parent 0c68668 commit 78a3556
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/gui/processing/qgsprocessingwidgetwrapper.cpp
Expand Up @@ -237,9 +237,6 @@ QgsExpressionContext QgsAbstractProcessingParameterWidgetWrapper::createExpressi

QgsExpressionContext c = context->expressionContext();

if ( linkedVectorLayer() )
c << QgsExpressionContextUtils::layerScope( linkedVectorLayer() );

if ( mWidgetContext.model() )
{
const QgsProcessingAlgorithm *alg = nullptr;
Expand All @@ -259,6 +256,9 @@ QgsExpressionContext QgsAbstractProcessingParameterWidgetWrapper::createExpressi
c.setHighlightedFunctions( highlightedFunctions );
}

if ( linkedVectorLayer() )
c << QgsExpressionContextUtils::layerScope( linkedVectorLayer() );

return c;
}

Expand Down

0 comments on commit 78a3556

Please sign in to comment.