Fix initial placement selection is empty

qgis · Aug 20, 2020 · a462a17 · a462a17
1 parent f62c6d5
commit a462a17
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/gui/labeling/qgslabelinggui.cpp b/src/gui/labeling/qgslabelinggui.cpp
@@ -353,7 +353,16 @@ void QgsLabelingGui::setLayer( QgsMapLayer *mapLayer )
 
   mCheckAllowLabelsOutsidePolygons->setChecked( mSettings.polygonPlacementFlags() & QgsLabeling::PolygonPlacementFlag::AllowPlacementOutsideOfPolygon );
 
-  mPlacementModeComboBox->setCurrentIndex( mPlacementModeComboBox->findData( mSettings.placement ) );
+  const int placementIndex = mPlacementModeComboBox->findData( mSettings.placement );
+  if ( placementIndex >= 0 )
+  {
+    mPlacementModeComboBox->setCurrentIndex( placementIndex );
+  }
+  else
+  {
+    // use default placement for layer type
+    mPlacementModeComboBox->setCurrentIndex( 0 );
+  }
 
   // Label repeat distance
   mRepeatDistanceSpinBox->setValue( mSettings.repeatDistance );