[gui][processing] Fix inconsistent behavior with the map layer widget…

…'s selected features only checkbox
qgis · Jan 21, 2025 · fc958b5 · fc958b5
1 parent c98dcb2
commit fc958b5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/core/qgsmaplayermodel.cpp b/src/core/qgsmaplayermodel.cpp
@@ -42,6 +42,8 @@ QgsMapLayerModel::QgsMapLayerModel( QObject *parent, QgsProject *project )
 
 void QgsMapLayerModel::setProject( QgsProject *project )
 {
+  if ( mProject == project ? project : QgsProject::instance() )
+    return;
 
   // remove layers from previous project
   if ( mProject )

diff --git a/src/gui/processing/qgsprocessingmaplayercombobox.cpp b/src/gui/processing/qgsprocessingmaplayercombobox.cpp
@@ -221,7 +221,10 @@ QgsProcessingMapLayerComboBox::~QgsProcessingMapLayerComboBox() = default;
 void QgsProcessingMapLayerComboBox::setLayer( QgsMapLayer *layer )
 {
   if ( layer || mParameter->flags() & Qgis::ProcessingParameterFlag::Optional )
-    mCombo->setLayer( layer );
+  {
+    whileBlocking( mCombo )->setLayer( layer );
+    onLayerChanged( layer );
+  }
 }
 
 QgsMapLayer *QgsProcessingMapLayerComboBox::currentLayer()