Revert "[bugfix] Crash on undo layout legend item on deleted item"

elpaso · elpaso · commit 583ccece2916 · 2018-06-17T17:10:10.000+02:00
This reverts commit 9def347.
diff --git a/src/core/layertree/qgslayertreemodel.cpp b/src/core/layertree/qgslayertreemodel.cpp
@@ -884,14 +884,14 @@ void QgsLayerTreeModel::disconnectFromLayer( QgsLayerTreeLayer *nodeLayer )
 {
   disconnect( nodeLayer, nullptr, this, nullptr ); // disconnect from delayed load of layer
 
+  if ( !nodeLayer->layer() )
+    return; // we were never connected
+
   if ( testFlag( ShowLegend ) )
   {
     removeLegendFromLayer( nodeLayer );
   }
 
-  if ( !nodeLayer->layer() )
-    return; // we were never connected
-
   if ( _numLayerCount( mRootNode, nodeLayer->layerId() ) == 1 )
   {
     // last instance of the layer in the tree: disconnect from all signals from layer!

Original file line number	Diff line number	Diff line change
`@@ -884,14 +884,14 @@ void QgsLayerTreeModel::disconnectFromLayer( QgsLayerTreeLayer *nodeLayer )`
`884`	`884`	`{`
`885`	`885`	`disconnect( nodeLayer, nullptr, this, nullptr ); // disconnect from delayed load of layer`
`886`	`886`
	`887`	`+ if ( !nodeLayer->layer() )`
	`888`	`+ return; // we were never connected`
	`889`	`+`
`887`	`890`	`if ( testFlag( ShowLegend ) )`
`888`	`891`	`{`
`889`	`892`	`removeLegendFromLayer( nodeLayer );`
`890`	`893`	`}`
`891`	`894`
`892`		`- if ( !nodeLayer->layer() )`
`893`		`- return; // we were never connected`
`894`		`-`
`895`	`895`	`if ( _numLayerCount( mRootNode, nodeLayer->layerId() ) == 1 )`
`896`	`896`	`{`
`897`	`897`	`// last instance of the layer in the tree: disconnect from all signals from layer!`