Don't double delete style configuration pages

m-kuhn · m-kuhn · commit c6cba65a5657 · 2016-06-11T09:52:11.000+02:00
Fixes a crash when switching between pages in the style configuration
dock widget.
diff --git a/src/app/qgsmapstylingwidget.cpp b/src/app/qgsmapstylingwidget.cpp
@@ -225,7 +225,7 @@ void QgsMapStylingWidget::redo()
 
 void QgsMapStylingWidget::updateCurrentWidgetLayer()
 {
-  QgsDebugMsg( "UPDATE!!!" );
+  QgsDebugMsgLevel( "UPDATE!!!", 4 );
   mBlockAutoApply = true;
 
   QgsMapLayer* layer = mCurrentLayer;
@@ -251,10 +251,6 @@ void QgsMapStylingWidget::updateCurrentWidgetLayer()
   {
     mRasterStyleWidget = widget;
   }
-  else
-  {
-    current->deleteLater();
-  }
 
   // Create the user page widget if we are on one of those pages
   // TODO Make all widgets use this method.
@@ -323,7 +319,7 @@ void QgsMapStylingWidget::updateCurrentWidgetLayer()
         mWidgetArea->setWidget( transwidget );
         break;
       }
-      case 2: // Transparency
+      case 2: // Histogram
       {
         if ( mRasterStyleWidget )
         {

Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ void QgsMapStylingWidget::redo()`
`225`	`225`
`226`	`226`	`void QgsMapStylingWidget::updateCurrentWidgetLayer()`
`227`	`227`	`{`
`228`		`- QgsDebugMsg( "UPDATE!!!" );`
	`228`	`+ QgsDebugMsgLevel( "UPDATE!!!", 4 );`
`229`	`229`	`mBlockAutoApply = true;`
`230`	`230`
`231`	`231`	`QgsMapLayer* layer = mCurrentLayer;`
`@@ -251,10 +251,6 @@ void QgsMapStylingWidget::updateCurrentWidgetLayer()`
`251`	`251`	`{`
`252`	`252`	`mRasterStyleWidget = widget;`
`253`	`253`	`}`
`254`		`- else`
`255`		`- {`
`256`		`- current->deleteLater();`
`257`		`- }`
`258`	`254`
`259`	`255`	`// Create the user page widget if we are on one of those pages`
`260`	`256`	`// TODO Make all widgets use this method.`
`@@ -323,7 +319,7 @@ void QgsMapStylingWidget::updateCurrentWidgetLayer()`
`323`	`319`	`mWidgetArea->setWidget( transwidget );`
`324`	`320`	`break;`
`325`	`321`	`}`
`326`		`- case 2: // Transparency`
	`322`	`+ case 2: // Histogram`
`327`	`323`	`{`
`328`	`324`	`if ( mRasterStyleWidget )`
`329`	`325`	`{`