[processing] Correct order of expression scopes in widget wrapper exp…

…ression contexts
qgis · Feb 12, 2019 · 2180b63 · 2180b63
1 parent 493aed5
commit 2180b63
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/gui/processing/qgsprocessingwidgetwrapper.cpp b/src/gui/processing/qgsprocessingwidgetwrapper.cpp
@@ -237,9 +237,6 @@ QgsExpressionContext QgsAbstractProcessingParameterWidgetWrapper::createExpressi
 
   QgsExpressionContext c = context->expressionContext();
 
-  if ( linkedVectorLayer() )
-    c << QgsExpressionContextUtils::layerScope( linkedVectorLayer() );
-
   if ( mWidgetContext.model() )
   {
     const QgsProcessingAlgorithm *alg = nullptr;
@@ -259,6 +256,9 @@ QgsExpressionContext QgsAbstractProcessingParameterWidgetWrapper::createExpressi
     c.setHighlightedFunctions( highlightedFunctions );
   }
 
+  if ( linkedVectorLayer() )
+    c << QgsExpressionContextUtils::layerScope( linkedVectorLayer() );
+
   return c;
 }