Fix more potential crashes in renderer widgets

qgis · Oct 7, 2015 · 2c39a5b · 2c39a5b
1 parent c6df096
commit 2c39a5b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/src/gui/symbology-ng/qgsheatmaprendererwidget.cpp b/src/gui/symbology-ng/qgsheatmaprendererwidget.cpp
@@ -133,7 +133,8 @@ QgsFeatureRendererV2* QgsHeatmapRendererWidget::renderer()
 void QgsHeatmapRendererWidget::setMapCanvas( QgsMapCanvas* canvas )
 {
   QgsRendererV2Widget::setMapCanvas( canvas );
-  mRadiusUnitWidget->setMapCanvas( canvas );
+  if ( mRadiusUnitWidget )
+    mRadiusUnitWidget->setMapCanvas( canvas );
 }
 
 void QgsHeatmapRendererWidget::applyColorRamp()

diff --git a/src/gui/symbology-ng/qgsinvertedpolygonrendererwidget.cpp b/src/gui/symbology-ng/qgsinvertedpolygonrendererwidget.cpp
@@ -114,7 +114,8 @@ QgsFeatureRendererV2* QgsInvertedPolygonRendererWidget::renderer()
 void QgsInvertedPolygonRendererWidget::setMapCanvas( QgsMapCanvas* canvas )
 {
   QgsRendererV2Widget::setMapCanvas( canvas );
-  mEmbeddedRendererWidget->setMapCanvas( canvas );
+  if ( mEmbeddedRendererWidget )
+    mEmbeddedRendererWidget->setMapCanvas( canvas );
 }
 
 void QgsInvertedPolygonRendererWidget::on_mRendererComboBox_currentIndexChanged( int index )

diff --git a/src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp b/src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp
@@ -171,8 +171,10 @@ QgsFeatureRendererV2* QgsPointDisplacementRendererWidget::renderer()
 void QgsPointDisplacementRendererWidget::setMapCanvas( QgsMapCanvas* canvas )
 {
   QgsRendererV2Widget::setMapCanvas( canvas );
-  mDistanceUnitWidget->setMapCanvas( canvas );
-  mEmbeddedRendererWidget->setMapCanvas( canvas );
+  if ( mDistanceUnitWidget )
+    mDistanceUnitWidget->setMapCanvas( canvas );
+  if ( mEmbeddedRendererWidget )
+    mEmbeddedRendererWidget->setMapCanvas( canvas );
 }
 
 void QgsPointDisplacementRendererWidget::on_mLabelFieldComboBox_currentIndexChanged( const QString& text )

diff --git a/src/gui/symbology-ng/qgssinglesymbolrendererv2widget.cpp b/src/gui/symbology-ng/qgssinglesymbolrendererv2widget.cpp
@@ -83,7 +83,8 @@ QgsFeatureRendererV2* QgsSingleSymbolRendererV2Widget::renderer()
 void QgsSingleSymbolRendererV2Widget::setMapCanvas( QgsMapCanvas* canvas )
 {
   QgsRendererV2Widget::setMapCanvas( canvas );
-  mSelector->setMapCanvas( canvas );
+  if ( mSelector )
+    mSelector->setMapCanvas( canvas );
 }
 
 void QgsSingleSymbolRendererV2Widget::changeSingleSymbol()