From a462a17ae5033435c0231fc69b05cd20d8289b02 Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Thu, 20 Aug 2020 15:54:07 +1000
Subject: [PATCH] Fix initial placement selection is empty

---
 src/gui/labeling/qgslabelinggui.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/gui/labeling/qgslabelinggui.cpp b/src/gui/labeling/qgslabelinggui.cpp
index 93a022322f9b..526ef41e75a5 100644
--- 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 );