[style dock] fix crash with undo widget

NathanW2 · NathanW2 · commit 459fa8c0c587 · 2016-07-02T22:56:07.000+10:00
diff --git a/src/app/qgslayerstylingwidget.cpp b/src/app/qgslayerstylingwidget.cpp
@@ -139,6 +139,9 @@ void QgsLayerStylingWidget::setLayer( QgsMapLayer *layer )
   }
 
   mCurrentLayer = layer;
+
+  mUndoWidget->setUndoStack( layer->undoStackStyles() );
+
   connect( mCurrentLayer, SIGNAL( styleChanged() ), this, SLOT( updateCurrentWidgetLayer() ) );
 
   int lastPage = mOptionsListWidget->currentIndex().row();
@@ -171,7 +174,6 @@ void QgsLayerStylingWidget::setLayer( QgsMapLayer *layer )
   {
     if ( factory->supportsLayer( layer ) )
     {
-      QgsDebugMsg( "MAKING PANEL" );
       QListWidgetItem* item =  new QListWidgetItem( factory->icon(), QString() );
       mOptionsListWidget->addItem( item );
       int row = mOptionsListWidget->row( item );
@@ -285,8 +287,6 @@ void QgsLayerStylingWidget::updateCurrentWidgetLayer()
 
   mBlockAutoApply = true;
 
-  mUndoWidget->setUndoStack( mCurrentLayer->undoStackStyles() );
-
   whileBlocking( mLayerCombo )->setLayer( mCurrentLayer );
 
   int row = mOptionsListWidget->currentIndex().row();
@@ -296,7 +296,6 @@ void QgsLayerStylingWidget::updateCurrentWidgetLayer()
   QgsPanelWidget* current = mWidgetStack->takeMainWidget();
   if ( current )
   {
-
     if ( QgsLabelingWidget* widget = qobject_cast<QgsLabelingWidget*>( current ) )
     {
       mLabelingWidget = widget;

Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,9 @@ void QgsLayerStylingWidget::setLayer( QgsMapLayer *layer )`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`mCurrentLayer = layer;`
	`142`	`+`
	`143`	`+ mUndoWidget->setUndoStack( layer->undoStackStyles() );`
	`144`	`+`
`142`	`145`	`connect( mCurrentLayer, SIGNAL( styleChanged() ), this, SLOT( updateCurrentWidgetLayer() ) );`
`143`	`146`
`144`	`147`	`int lastPage = mOptionsListWidget->currentIndex().row();`
`@@ -171,7 +174,6 @@ void QgsLayerStylingWidget::setLayer( QgsMapLayer *layer )`
`171`	`174`	`{`
`172`	`175`	`if ( factory->supportsLayer( layer ) )`
`173`	`176`	`{`
`174`		`- QgsDebugMsg( "MAKING PANEL" );`
`175`	`177`	`QListWidgetItem* item = new QListWidgetItem( factory->icon(), QString() );`
`176`	`178`	`mOptionsListWidget->addItem( item );`
`177`	`179`	`int row = mOptionsListWidget->row( item );`
`@@ -285,8 +287,6 @@ void QgsLayerStylingWidget::updateCurrentWidgetLayer()`
`285`	`287`
`286`	`288`	`mBlockAutoApply = true;`
`287`	`289`
`288`		`- mUndoWidget->setUndoStack( mCurrentLayer->undoStackStyles() );`
`289`		`-`
`290`	`290`	`whileBlocking( mLayerCombo )->setLayer( mCurrentLayer );`
`291`	`291`
`292`	`292`	`int row = mOptionsListWidget->currentIndex().row();`
`@@ -296,7 +296,6 @@ void QgsLayerStylingWidget::updateCurrentWidgetLayer()`
`296`	`296`	`QgsPanelWidget* current = mWidgetStack->takeMainWidget();`
`297`	`297`	`if ( current )`
`298`	`298`	`{`
`299`		`-`
`300`	`299`	`if ( QgsLabelingWidget* widget = qobject_cast<QgsLabelingWidget*>( current ) )`
`301`	`300`	`{`
`302`	`301`	`mLabelingWidget = widget;`