[processing] reset variables list in field calculator on layer change (…

…fix #15633)
qgis · May 4, 2017 · c2699b4 · c2699b4
1 parent eda1730
commit c2699b4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/python/plugins/processing/algs/qgis/ui/FieldsCalculatorDialog.py b/python/plugins/processing/algs/qgis/ui/FieldsCalculatorDialog.py
@@ -105,7 +105,6 @@ def manageGui(self):
         self.mOutputFieldTypeComboBox.blockSignals(False)
         self.builder.loadRecent('fieldcalc')
 
-        self.initContext()
         self.updateLayer(self.cmbInputLayer.currentLayer())
 
     def initContext(self):
@@ -117,6 +116,8 @@ def initContext(self):
 
     def updateLayer(self, layer):
         self.layer = layer
+
+        self.initContext()
         self.builder.setLayer(self.layer)
         self.builder.loadFieldNames()
         self.populateFields()

diff --git a/src/gui/qgsexpressionbuilderwidget.cpp b/src/gui/qgsexpressionbuilderwidget.cpp
@@ -516,8 +516,7 @@ void QgsExpressionBuilderWidget::setExpressionText( const QString &expression )
 void QgsExpressionBuilderWidget::setExpressionContext( const QgsExpressionContext &context )
 {
   mExpressionContext = context;
-
-  loadExpressionContext();
+  updateFunctionTree();
 }
 
 void QgsExpressionBuilderWidget::on_txtExpressionString_textChanged()