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

This reverts commit 9def347.
qgis · Jun 17, 2018 · 583ccec · 583ccec
1 parent 9def347
commit 583ccec
Showing 1 changed file with 3 additions and 3 deletions.
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!