[processing] reset variables list in field calculator on layer change (fix #15633)

alexbruy · alexbruy · commit 2185d42dbcd8 · 2017-05-05T16:47:22.000+03:00
diff --git a/python/plugins/processing/algs/qgis/ui/FieldsCalculatorDialog.py b/python/plugins/processing/algs/qgis/ui/FieldsCalculatorDialog.py
@@ -89,7 +89,6 @@ def manageGui(self):
 
         self.builder.loadRecent('fieldcalc')
 
-        self.initContext()
         self.updateLayer()
 
     def initContext(self):
@@ -103,6 +102,7 @@ def initContext(self):
 
     def updateLayer(self):
         self.layer = dataobjects.getObject(self.cmbInputLayer.currentText())
+        self.initContext()
         self.builder.setLayer(self.layer)
         self.builder.loadFieldNames()
         self.populateFields()
diff --git a/src/gui/qgsexpressionbuilderwidget.cpp b/src/gui/qgsexpressionbuilderwidget.cpp
@@ -514,7 +514,7 @@ void QgsExpressionBuilderWidget::setExpressionContext( const QgsExpressionContex
 {
   mExpressionContext = context;
 
-  loadExpressionContext();
+  updateFunctionTree();
 }
 
 void QgsExpressionBuilderWidget::on_txtExpressionString_textChanged()

Original file line number	Diff line number	Diff line change
`@@ -514,7 +514,7 @@ void QgsExpressionBuilderWidget::setExpressionContext( const QgsExpressionContex`
`514`	`514`	`{`
`515`	`515`	`mExpressionContext = context;`
`516`	`516`
`517`		`- loadExpressionContext();`
	`517`	`+ updateFunctionTree();`
`518`	`518`	`}`
`519`	`519`
`520`	`520`	`void QgsExpressionBuilderWidget::on_txtExpressionString_textChanged()`