Fix a crash in layer node after removal of layer from registry.

A crash may occur when using custom layer tree in composer legend and layer from that tree is removed from registry. This would happen only in some code paths.
qgis · Nov 7, 2014 · a54c31d · a54c31d
1 parent 2597100
commit a54c31d
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/core/layertree/qgslayertreelayer.cpp b/src/core/layertree/qgslayertreelayer.cpp
@@ -23,10 +23,11 @@
 QgsLayerTreeLayer::QgsLayerTreeLayer( QgsMapLayer *layer )
     : QgsLayerTreeNode( NodeLayer )
     , mLayerId( layer->id() )
-    , mLayer( layer )
+    , mLayer( 0 )
     , mVisible( Qt::Checked )
 {
   Q_ASSERT( QgsMapLayerRegistry::instance()->mapLayer( mLayerId ) == layer );
+  attachToLayer();
 }
 
 QgsLayerTreeLayer::QgsLayerTreeLayer( QString layerId, QString name )
@@ -148,8 +149,8 @@ void QgsLayerTreeLayer::registryLayersAdded( QList<QgsMapLayer*> layers )
   {
     if ( l->id() == mLayerId )
     {
-      mLayer = l;
       disconnect( QgsMapLayerRegistry::instance(), SIGNAL( layersAdded( QList<QgsMapLayer*> ) ), this, SLOT( registryLayersAdded( QList<QgsMapLayer*> ) ) );
+      attachToLayer();
       emit layerLoaded();
       break;
     }