Skip to content

Commit fb71f72

Browse files
committedSep 28, 2016
fix #15634
(cherry picked from commit be16776)
1 parent dedf4a5 commit fb71f72

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed
 

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -969,11 +969,11 @@ void QgsCategorizedSymbolRendererWidget::matchToSymbolsFromXml()
969969

970970
void QgsCategorizedSymbolRendererWidget::cleanUpSymbolSelector( QgsPanelWidget *container )
971971
{
972-
if ( container )
973-
{
974-
QgsSymbolSelectorWidget* dlg = qobject_cast<QgsSymbolSelectorWidget*>( container );
975-
delete dlg->symbol();
976-
}
972+
QgsSymbolSelectorWidget* dlg = qobject_cast<QgsSymbolSelectorWidget*>( container );
973+
if ( !dlg )
974+
return;
975+
976+
delete dlg->symbol();
977977
}
978978

979979
void QgsCategorizedSymbolRendererWidget::updateSymbolsFromWidget()

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -688,11 +688,11 @@ void QgsGraduatedSymbolRendererWidget::refreshRanges( bool reset )
688688

689689
void QgsGraduatedSymbolRendererWidget::cleanUpSymbolSelector( QgsPanelWidget *container )
690690
{
691-
if ( container )
692-
{
693-
QgsSymbolSelectorWidget* dlg = qobject_cast<QgsSymbolSelectorWidget*>( container );
694-
delete dlg->symbol();
695-
}
691+
QgsSymbolSelectorWidget *dlg = qobject_cast<QgsSymbolSelectorWidget*>( container );
692+
if ( !dlg )
693+
return;
694+
695+
delete dlg->symbol();
696696
}
697697

698698
void QgsGraduatedSymbolRendererWidget::updateSymbolsFromWidget()

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,10 @@ void QgsRuleBasedRendererWidget::refineRuleRangesAccepted( QgsPanelWidget *panel
483483

484484
void QgsRuleBasedRendererWidget::ruleWidgetPanelAccepted( QgsPanelWidget *panel )
485485
{
486-
QgsRendererRulePropsWidget* widget = qobject_cast<QgsRendererRulePropsWidget*>( panel );
486+
QgsRendererRulePropsWidget *widget = qobject_cast<QgsRendererRulePropsWidget*>( panel );
487+
if ( !widget )
488+
return;
489+
487490
widget->apply();
488491

489492
// model should know about the change and emit dataChanged signal for the view

0 commit comments

Comments
 (0)
Please sign in to comment.