Avoid duplicate 'follow label placement' options in combo box

qgis · Jul 8, 2016 · ea3fc65 · ea3fc65
1 parent 6c0afcd
commit ea3fc65
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp
@@ -590,7 +590,14 @@ void QgsLabelingGui::init()
   if ( mLayer->geometryType() == QGis::Point )
   {
     // follow placement alignment is only valid for point layers
-    mFontMultiLineAlignComboBox->addItem( tr( "Follow label placement" ) );
+    if ( mFontMultiLineAlignComboBox->findText( tr( "Follow label placement" ) ) == -1 )
+      mFontMultiLineAlignComboBox->addItem( tr( "Follow label placement" ) );
+  }
+  else
+  {
+    int idx = mFontMultiLineAlignComboBox->findText( tr( "Follow label placement" ) );
+    if ( idx >= 0 )
+      mFontMultiLineAlignComboBox->removeItem( idx );
   }
 
   // load labeling settings from layer