Fix crash when using 2.5D renderer with incompatible layer

m-kuhn · m-kuhn · commit e858a6d5acb6 · 2016-06-06T12:36:04.000+02:00
Fixes #14814
diff --git a/src/gui/symbology-ng/qgs25drendererwidget.cpp b/src/gui/symbology-ng/qgs25drendererwidget.cpp
@@ -97,10 +97,13 @@ void Qgs25DRendererWidget::updateRenderer()
 
 void Qgs25DRendererWidget::apply()
 {
-  QgsExpressionContextUtils::setLayerVariable( mLayer, "qgis_25d_height", mHeightWidget->currentText() );
-  QgsExpressionContextUtils::setLayerVariable( mLayer, "qgis_25d_angle", mAngleWidget->value() );
+  if ( mHeightWidget )
+  {
+    QgsExpressionContextUtils::setLayerVariable( mLayer, "qgis_25d_height", mHeightWidget->currentText() );
+    QgsExpressionContextUtils::setLayerVariable( mLayer, "qgis_25d_angle", mAngleWidget->value() );
 
-  emit layerVariablesChanged();
+    emit layerVariablesChanged();
+  }
 }
 
 QgsRendererV2Widget* Qgs25DRendererWidget::create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer )

Original file line number	Diff line number	Diff line change
`@@ -97,10 +97,13 @@ void Qgs25DRendererWidget::updateRenderer()`
`97`	`97`
`98`	`98`	`void Qgs25DRendererWidget::apply()`
`99`	`99`	`{`
`100`		`- QgsExpressionContextUtils::setLayerVariable( mLayer, "qgis_25d_height", mHeightWidget->currentText() );`
`101`		`- QgsExpressionContextUtils::setLayerVariable( mLayer, "qgis_25d_angle", mAngleWidget->value() );`
	`100`	`+ if ( mHeightWidget )`
	`101`	`+ {`
	`102`	`+ QgsExpressionContextUtils::setLayerVariable( mLayer, "qgis_25d_height", mHeightWidget->currentText() );`
	`103`	`+ QgsExpressionContextUtils::setLayerVariable( mLayer, "qgis_25d_angle", mAngleWidget->value() );`
`102`	`104`
`103`		`- emit layerVariablesChanged();`
	`105`	`+ emit layerVariablesChanged();`
	`106`	`+ }`
`104`	`107`	`}`
`105`	`108`
`106`	`109`	`QgsRendererV2Widget* Qgs25DRendererWidget::create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer )`