fix #15634

(cherry picked from commit be16776)
qgis · Sep 28, 2016 · fb71f72 · fb71f72
1 parent dedf4a5
commit fb71f72
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/src/gui/symbology-ng/qgscategorizedsymbolrendererwidget.cpp b/src/gui/symbology-ng/qgscategorizedsymbolrendererwidget.cpp
@@ -969,11 +969,11 @@ void QgsCategorizedSymbolRendererWidget::matchToSymbolsFromXml()
 
 void QgsCategorizedSymbolRendererWidget::cleanUpSymbolSelector( QgsPanelWidget *container )
 {
-  if ( container )
-  {
-    QgsSymbolSelectorWidget* dlg = qobject_cast<QgsSymbolSelectorWidget*>( container );
-    delete dlg->symbol();
-  }
+  QgsSymbolSelectorWidget* dlg = qobject_cast<QgsSymbolSelectorWidget*>( container );
+  if ( !dlg )
+    return;
+
+  delete dlg->symbol();
 }
 
 void QgsCategorizedSymbolRendererWidget::updateSymbolsFromWidget()

diff --git a/src/gui/symbology-ng/qgsgraduatedsymbolrendererwidget.cpp b/src/gui/symbology-ng/qgsgraduatedsymbolrendererwidget.cpp
@@ -688,11 +688,11 @@ void QgsGraduatedSymbolRendererWidget::refreshRanges( bool reset )
 
 void QgsGraduatedSymbolRendererWidget::cleanUpSymbolSelector( QgsPanelWidget *container )
 {
-  if ( container )
-  {
-    QgsSymbolSelectorWidget* dlg = qobject_cast<QgsSymbolSelectorWidget*>( container );
-    delete dlg->symbol();
-  }
+  QgsSymbolSelectorWidget *dlg = qobject_cast<QgsSymbolSelectorWidget*>( container );
+  if ( !dlg )
+    return;
+
+  delete dlg->symbol();
 }
 
 void QgsGraduatedSymbolRendererWidget::updateSymbolsFromWidget()

diff --git a/src/gui/symbology-ng/qgsrulebasedrendererwidget.cpp b/src/gui/symbology-ng/qgsrulebasedrendererwidget.cpp
@@ -483,7 +483,10 @@ void QgsRuleBasedRendererWidget::refineRuleRangesAccepted( QgsPanelWidget *panel
 
 void QgsRuleBasedRendererWidget::ruleWidgetPanelAccepted( QgsPanelWidget *panel )
 {
-  QgsRendererRulePropsWidget* widget = qobject_cast<QgsRendererRulePropsWidget*>( panel );
+  QgsRendererRulePropsWidget *widget = qobject_cast<QgsRendererRulePropsWidget*>( panel );
+  if ( !widget )
+    return;
+
   widget->apply();
 
   // model should know about the change and emit dataChanged signal for the view