used Python "and" keyword instead of && :S

qgis · Oct 10, 2011 · 0d187bf2a4b38b1434e052f399359959da4a21b1 · 0d187bf
1 parent ee9ab82
commit 0d187bf2a4b38b1434e052f399359959da4a21b1
Unified Split

Showing with 1 addition and 1 deletion.

+1 −1 src/app/qgslabelinggui.cpp
diff --git a/src/app/qgslabelinggui.cpp b/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