Fix crash when using expression bar on aliased field

m-kuhn · m-kuhn · commit a0c6872f6cb0 · 2017-05-12T12:41:39.000+02:00
Fix #16302
diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -431,13 +431,13 @@ void QgsAttributeTableDialog::updateFieldFromExpression()
 {
   bool filtered = mMainView->filterMode() != QgsAttributeTableFilterModel::ShowAll;
   QgsFeatureIds filteredIds = filtered ? mMainView->filteredFeatures() : QgsFeatureIds();
-  runFieldCalculation( mLayer, mFieldCombo->currentText(), mUpdateExpressionText->asExpression(), filteredIds );
+  runFieldCalculation( mLayer, mFieldCombo->currentField(), mUpdateExpressionText->asExpression(), filteredIds );
 }
 
 void QgsAttributeTableDialog::updateFieldFromExpressionSelected()
 {
   QgsFeatureIds filteredIds = mLayer->selectedFeatureIds();
-  runFieldCalculation( mLayer, mFieldCombo->currentText(), mUpdateExpressionText->asExpression(), filteredIds );
+  runFieldCalculation( mLayer, mFieldCombo->currentField(), mUpdateExpressionText->asExpression(), filteredIds );
 }
 
 void QgsAttributeTableDialog::viewModeChanged( QgsAttributeForm::Mode mode )

Original file line number	Diff line number	Diff line change
`@@ -431,13 +431,13 @@ void QgsAttributeTableDialog::updateFieldFromExpression()`
`431`	`431`	`{`
`432`	`432`	`bool filtered = mMainView->filterMode() != QgsAttributeTableFilterModel::ShowAll;`
`433`	`433`	`QgsFeatureIds filteredIds = filtered ? mMainView->filteredFeatures() : QgsFeatureIds();`
`434`		`- runFieldCalculation( mLayer, mFieldCombo->currentText(), mUpdateExpressionText->asExpression(), filteredIds );`
	`434`	`+ runFieldCalculation( mLayer, mFieldCombo->currentField(), mUpdateExpressionText->asExpression(), filteredIds );`
`435`	`435`	`}`
`436`	`436`
`437`	`437`	`void QgsAttributeTableDialog::updateFieldFromExpressionSelected()`
`438`	`438`	`{`
`439`	`439`	`QgsFeatureIds filteredIds = mLayer->selectedFeatureIds();`
`440`		`- runFieldCalculation( mLayer, mFieldCombo->currentText(), mUpdateExpressionText->asExpression(), filteredIds );`
	`440`	`+ runFieldCalculation( mLayer, mFieldCombo->currentField(), mUpdateExpressionText->asExpression(), filteredIds );`
`441`	`441`	`}`
`442`	`442`
`443`	`443`	`void QgsAttributeTableDialog::viewModeChanged( QgsAttributeForm::Mode mode )`