Merge pull request #2361 from m-kuhn/fix13549

nyalldawson · nyalldawson · commit 5f2d98caa4bc · 2015-10-10T23:02:38.000+11:00
Cleanup symbol definition widgets when switching between symbol layers
diff --git a/src/gui/symbology-ng/qgssymbolslistwidget.cpp b/src/gui/symbology-ng/qgssymbolslistwidget.cpp
@@ -118,6 +118,13 @@ QgsSymbolsListWidget::QgsSymbolsListWidget( QgsSymbolV2* symbol, QgsStyleV2* sty
   btnColor->setContext( "symbology" );
 }
 
+QgsSymbolsListWidget::~QgsSymbolsListWidget()
+{
+  // This action was added to the menu by this widget, clean it up
+  // The menu can be passed in the constructor, so may live longer than this widget
+  btnAdvanced->menu()->removeAction( mClipFeaturesAction );
+}
+
 void QgsSymbolsListWidget::setMapCanvas( QgsMapCanvas* canvas )
 {
   mMapCanvas = canvas;
diff --git a/src/gui/symbology-ng/qgssymbolslistwidget.h b/src/gui/symbology-ng/qgssymbolslistwidget.h
@@ -32,12 +32,16 @@ class GUI_EXPORT QgsSymbolsListWidget : public QWidget, private Ui::SymbolsListW
   public:
     QgsSymbolsListWidget( QgsSymbolV2* symbol, QgsStyleV2* style, QMenu* menu, QWidget* parent, const QgsVectorLayer * layer = 0 );
 
+    //! Destructor
+    virtual ~QgsSymbolsListWidget();
+
     /** Returns the expression context used for the widget, if set. This expression context is used for
      * evaluating data defined symbol properties and for populating based expression widgets in
      * the list widget.
      * @note added in QGIS 2.12
      * @see setExpressionContext()
      */
+
     QgsExpressionContext* expressionContext() const { return mPresetExpressionContext; }
 
     /** Sets the map canvas associated with the widget. This allows the widget to retrieve the current
diff --git a/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp b/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
@@ -472,13 +472,8 @@ void QgsSymbolV2SelectorDialog::setWidget( QWidget* widget )
 {
   int index = stackedWidget->addWidget( widget );
   stackedWidget->setCurrentIndex( index );
-  if ( mPresentWidget )
-  {
-    stackedWidget->removeWidget( mPresentWidget );
-    QWidget *dummy = mPresentWidget;
-    mPresentWidget = widget;
-    delete dummy; // auto disconnects all signals
-  }
+  delete mPresentWidget;
+  mPresentWidget = widget;
 }
 
 void QgsSymbolV2SelectorDialog::updateLockButton()

Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,13 @@ QgsSymbolsListWidget::QgsSymbolsListWidget( QgsSymbolV2* symbol, QgsStyleV2* sty`
`118`	`118`	`btnColor->setContext( "symbology" );`
`119`	`119`	`}`
`120`	`120`
	`121`	`+QgsSymbolsListWidget::~QgsSymbolsListWidget()`
	`122`	`+{`
	`123`	`+ // This action was added to the menu by this widget, clean it up`
	`124`	`+ // The menu can be passed in the constructor, so may live longer than this widget`
	`125`	`+ btnAdvanced->menu()->removeAction( mClipFeaturesAction );`
	`126`	`+}`
	`127`	`+`
`121`	`128`	`void QgsSymbolsListWidget::setMapCanvas( QgsMapCanvas* canvas )`
`122`	`129`	`{`
`123`	`130`	`mMapCanvas = canvas;`