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

wonder-sk · wonder-sk · commit a54c31d5abc6 · 2014-11-08T00:05:44.000+07:00
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.
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;
     }

Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,11 @@`
`23`	`23`	`QgsLayerTreeLayer::QgsLayerTreeLayer( QgsMapLayer *layer )`
`24`	`24`	`: QgsLayerTreeNode( NodeLayer )`
`25`	`25`	`, mLayerId( layer->id() )`
`26`		`- , mLayer( layer )`
	`26`	`+ , mLayer( 0 )`
`27`	`27`	`, mVisible( Qt::Checked )`
`28`	`28`	`{`
`29`	`29`	`Q_ASSERT( QgsMapLayerRegistry::instance()->mapLayer( mLayerId ) == layer );`
	`30`	`+ attachToLayer();`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`QgsLayerTreeLayer::QgsLayerTreeLayer( QString layerId, QString name )`
`@@ -148,8 +149,8 @@ void QgsLayerTreeLayer::registryLayersAdded( QList<QgsMapLayer*> layers )`
`148`	`149`	`{`
`149`	`150`	`if ( l->id() == mLayerId )`
`150`	`151`	`{`
`151`		`- mLayer = l;`
`152`	`152`	`disconnect( QgsMapLayerRegistry::instance(), SIGNAL( layersAdded( QList<QgsMapLayer> ) ), this, SLOT( registryLayersAdded( QList<QgsMapLayer> ) ) );`
	`153`	`+ attachToLayer();`
`153`	`154`	`emit layerLoaded();`
`154`	`155`	`break;`
`155`	`156`	`}`