Merge pull request #9571 from qgis/backport-9563-on-release-3_6

elpaso · web-flow · commit 885267decfdb · 2019-03-20T14:55:36.000+01:00
Backport #9563 on release-3_6
diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp
@@ -833,6 +833,11 @@ void QgsRasterLayerProperties::sync()
  */
 void QgsRasterLayerProperties::apply()
 {
+
+  // Do nothing on "bad" layers
+  if ( !mRasterLayer->isValid() )
+    return;
+
   /*
    * Legend Tab
    */
@@ -1193,7 +1198,7 @@ void QgsRasterLayerProperties::urlClicked( const QUrl &url )
 
 void QgsRasterLayerProperties::mRenderTypeComboBox_currentIndexChanged( int index )
 {
-  if ( index < 0 || mDisableRenderTypeComboBoxCurrentIndexChanged )
+  if ( index < 0 || mDisableRenderTypeComboBoxCurrentIndexChanged || ! mRasterLayer->renderer() )
   {
     return;
   }

Original file line number	Diff line number	Diff line change
`@@ -833,6 +833,11 @@ void QgsRasterLayerProperties::sync()`
`833`	`833`	`*/`
`834`	`834`	`void QgsRasterLayerProperties::apply()`
`835`	`835`	`{`
	`836`	`+`
	`837`	`+ // Do nothing on "bad" layers`
	`838`	`+ if ( !mRasterLayer->isValid() )`
	`839`	`+ return;`
	`840`	`+`
`836`	`841`	`/*`
`837`	`842`	`* Legend Tab`
`838`	`843`	`*/`
`@@ -1193,7 +1198,7 @@ void QgsRasterLayerProperties::urlClicked( const QUrl &url )`
`1193`	`1198`
`1194`	`1199`	`void QgsRasterLayerProperties::mRenderTypeComboBox_currentIndexChanged( int index )`
`1195`	`1200`	`{`
`1196`		`- if ( index < 0 \|\| mDisableRenderTypeComboBoxCurrentIndexChanged )`
	`1201`	`+ if ( index < 0 \|\| mDisableRenderTypeComboBoxCurrentIndexChanged \|\| ! mRasterLayer->renderer() )`
`1197`	`1202`	`{`
`1198`	`1203`	`return;`
`1199`	`1204`	`}`