Fix double delete of symbol

Fix #15961
qgis · May 12, 2017 · aa0ce1c · aa0ce1c
1 parent 396a135
commit aa0ce1c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp b/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
@@ -1011,7 +1011,7 @@ void QgsCategorizedSymbolRendererV2Widget::cleanUpSymbolSelector( QgsPanelWidget
   if ( !dlg )
     return;
 
-  delete dlg->symbol();
+  dlg->releaseSymbol();
 }
 
 void QgsCategorizedSymbolRendererV2Widget::updateSymbolsFromWidget()

diff --git a/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp b/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
@@ -693,7 +693,7 @@ void QgsGraduatedSymbolRendererV2Widget::cleanUpSymbolSelector( QgsPanelWidget *
   if ( !dlg )
     return;
 
-  delete dlg->symbol();
+  dlg->releaseSymbol();
 }
 
 void QgsGraduatedSymbolRendererV2Widget::updateSymbolsFromWidget()

diff --git a/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp b/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
@@ -300,6 +300,12 @@ void QgsSymbolV2SelectorWidget::setMapCanvas( QgsMapCanvas *canvas )
     listWidget->setMapCanvas( canvas );
 }
 
+void QgsSymbolV2SelectorWidget::releaseSymbol()
+{
+  delete mSymbol;
+  mSymbol = nullptr;
+}
+
 void QgsSymbolV2SelectorWidget::loadSymbol( QgsSymbolV2* symbol, SymbolLayerItem* parent )
 {
   SymbolLayerItem* symbolItem = new SymbolLayerItem( symbol );

diff --git a/src/gui/symbology-ng/qgssymbolv2selectordialog.h b/src/gui/symbology-ng/qgssymbolv2selectordialog.h
@@ -128,6 +128,14 @@ class GUI_EXPORT QgsSymbolV2SelectorWidget: public QgsPanelWidget, private Ui::Q
      */
     QgsSymbolV2* symbol() { return mSymbol; }
 
+    /**
+     * Delete the symbol.
+     *
+     * \note Not available in Python
+     * \note Added in QGIS 2.18.8
+     */
+    void releaseSymbol();
+
   protected:
 
     /**