Skip to content

Commit 2c39a5b

Browse files
committed
Fix more potential crashes in renderer widgets
1 parent c6df096 commit 2c39a5b

4 files changed

Lines changed: 10 additions & 5 deletions

File tree

‎src/gui/symbology-ng/qgsheatmaprendererwidget.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,8 @@ QgsFeatureRendererV2* QgsHeatmapRendererWidget::renderer()
133133
void QgsHeatmapRendererWidget::setMapCanvas( QgsMapCanvas* canvas )
134134
{
135135
QgsRendererV2Widget::setMapCanvas( canvas );
136-
mRadiusUnitWidget->setMapCanvas( canvas );
136+
if ( mRadiusUnitWidget )
137+
mRadiusUnitWidget->setMapCanvas( canvas );
137138
}
138139

139140
void QgsHeatmapRendererWidget::applyColorRamp()

‎src/gui/symbology-ng/qgsinvertedpolygonrendererwidget.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@ QgsFeatureRendererV2* QgsInvertedPolygonRendererWidget::renderer()
114114
void QgsInvertedPolygonRendererWidget::setMapCanvas( QgsMapCanvas* canvas )
115115
{
116116
QgsRendererV2Widget::setMapCanvas( canvas );
117-
mEmbeddedRendererWidget->setMapCanvas( canvas );
117+
if ( mEmbeddedRendererWidget )
118+
mEmbeddedRendererWidget->setMapCanvas( canvas );
118119
}
119120

120121
void QgsInvertedPolygonRendererWidget::on_mRendererComboBox_currentIndexChanged( int index )

‎src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,10 @@ QgsFeatureRendererV2* QgsPointDisplacementRendererWidget::renderer()
171171
void QgsPointDisplacementRendererWidget::setMapCanvas( QgsMapCanvas* canvas )
172172
{
173173
QgsRendererV2Widget::setMapCanvas( canvas );
174-
mDistanceUnitWidget->setMapCanvas( canvas );
175-
mEmbeddedRendererWidget->setMapCanvas( canvas );
174+
if ( mDistanceUnitWidget )
175+
mDistanceUnitWidget->setMapCanvas( canvas );
176+
if ( mEmbeddedRendererWidget )
177+
mEmbeddedRendererWidget->setMapCanvas( canvas );
176178
}
177179

178180
void QgsPointDisplacementRendererWidget::on_mLabelFieldComboBox_currentIndexChanged( const QString& text )

‎src/gui/symbology-ng/qgssinglesymbolrendererv2widget.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ QgsFeatureRendererV2* QgsSingleSymbolRendererV2Widget::renderer()
8383
void QgsSingleSymbolRendererV2Widget::setMapCanvas( QgsMapCanvas* canvas )
8484
{
8585
QgsRendererV2Widget::setMapCanvas( canvas );
86-
mSelector->setMapCanvas( canvas );
86+
if ( mSelector )
87+
mSelector->setMapCanvas( canvas );
8788
}
8889

8990
void QgsSingleSymbolRendererV2Widget::changeSingleSymbol()

0 commit comments

Comments
 (0)