Skip to content
Permalink
Browse files

Merge branch 'expression-labels' of github.com:NathanW2/Quantum-GIS i…

…nto expression-labels
  • Loading branch information
NathanW2 committed Oct 15, 2011
2 parents 4e6f83b + 0d187bf commit 0359e5b41760048b1f21e301a66bbb19becf59cf
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/app/qgslabelinggui.cpp
@@ -82,7 +82,7 @@ QgsLabelingGui::QgsLabelingGui( QgsPalLabeling* lbl, QgsVectorLayer* layer, QgsM
btnExpression->setEnabled( lyr.enabled );

//Add the current expression to the bottom of the list.
if (lyr.isExpression and !lyr.fieldName.isEmpty())
if (lyr.isExpression && !lyr.fieldName.isEmpty())
cboFieldName->addItem(lyr.fieldName);

// placement

0 comments on commit 0359e5b

Please sign in to comment.
You can’t perform that action at this time.