[processing] Fix 'selected features only' is disabled by default

nyalldawson · nyalldawson · commit 0ea7187ae4b9 · 2020-05-27T13:29:12.000+10:00
Fixes #36753
diff --git a/src/gui/processing/qgsprocessingmaplayercombobox.cpp b/src/gui/processing/qgsprocessingmaplayercombobox.cpp
@@ -298,11 +298,6 @@ void QgsProcessingMapLayerComboBox::setValue( const QVariant &value, QgsProcessi
   if ( !found )
   {
     const QString string = val.toString();
-    if ( mUseSelectionCheckBox )
-    {
-      mUseSelectionCheckBox->setChecked( false );
-      mUseSelectionCheckBox->setEnabled( false );
-    }
     if ( mIterateButton )
       mIterateButton->setChecked( iterate );
 
@@ -316,13 +311,23 @@ void QgsProcessingMapLayerComboBox::setValue( const QVariant &value, QgsProcessi
         mCombo->setAdditionalItems( additional );
       }
       mCombo->setCurrentIndex( mCombo->findText( string ) ); // this may or may not throw a signal, so let's block it..
+      if ( mUseSelectionCheckBox )
+      {
+        mUseSelectionCheckBox->setChecked( false );
+        mUseSelectionCheckBox->setEnabled( false );
+      }
       mBlockChangedSignal--;
       if ( !mBlockChangedSignal )
         emit valueChanged(); // and ensure we only ever raise one
     }
     else if ( mParameter->flags() & QgsProcessingParameterDefinition::FlagOptional )
     {
       mCombo->setLayer( nullptr );
+      if ( mUseSelectionCheckBox )
+      {
+        mUseSelectionCheckBox->setChecked( false );
+        mUseSelectionCheckBox->setEnabled( false );
+      }
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -298,11 +298,6 @@ void QgsProcessingMapLayerComboBox::setValue( const QVariant &value, QgsProcessi`
`298`	`298`	`if ( !found )`
`299`	`299`	`{`
`300`	`300`	`const QString string = val.toString();`
`301`		`- if ( mUseSelectionCheckBox )`
`302`		`- {`
`303`		`- mUseSelectionCheckBox->setChecked( false );`
`304`		`- mUseSelectionCheckBox->setEnabled( false );`
`305`		`- }`
`306`	`301`	`if ( mIterateButton )`
`307`	`302`	`mIterateButton->setChecked( iterate );`
`308`	`303`
`@@ -316,13 +311,23 @@ void QgsProcessingMapLayerComboBox::setValue( const QVariant &value, QgsProcessi`
`316`	`311`	`mCombo->setAdditionalItems( additional );`
`317`	`312`	`}`
`318`	`313`	`mCombo->setCurrentIndex( mCombo->findText( string ) ); // this may or may not throw a signal, so let's block it..`
	`314`	`+ if ( mUseSelectionCheckBox )`
	`315`	`+ {`
	`316`	`+ mUseSelectionCheckBox->setChecked( false );`
	`317`	`+ mUseSelectionCheckBox->setEnabled( false );`
	`318`	`+ }`
`319`	`319`	`mBlockChangedSignal--;`
`320`	`320`	`if ( !mBlockChangedSignal )`
`321`	`321`	`emit valueChanged(); // and ensure we only ever raise one`
`322`	`322`	`}`
`323`	`323`	`else if ( mParameter->flags() & QgsProcessingParameterDefinition::FlagOptional )`
`324`	`324`	`{`
`325`	`325`	`mCombo->setLayer( nullptr );`
	`326`	`+ if ( mUseSelectionCheckBox )`
	`327`	`+ {`
	`328`	`+ mUseSelectionCheckBox->setChecked( false );`
	`329`	`+ mUseSelectionCheckBox->setEnabled( false );`
	`330`	`+ }`
`326`	`331`	`}`
`327`	`332`	`}`
`328`	`333`	`}`