Do not return invalid layers from findLayers()

elpaso · elpaso · commit 2f2221aec7a1 · 2018-06-07T08:16:11.000+02:00
diff --git a/src/core/layertree/qgslayertreegroup.cpp b/src/core/layertree/qgslayertreegroup.cpp
@@ -221,7 +221,7 @@ QList<QgsLayerTreeLayer *> QgsLayerTreeGroup::findLayers() const
   QList<QgsLayerTreeLayer *> list;
   Q_FOREACH ( QgsLayerTreeNode *child, mChildren )
   {
-    if ( QgsLayerTree::isLayer( child ) )
+    if ( QgsLayerTree::isLayer( child ) && QgsLayerTree::toLayer( child )->layer( ) )
       list << QgsLayerTree::toLayer( child );
     else if ( QgsLayerTree::isGroup( child ) )
       list << QgsLayerTree::toGroup( child )->findLayers();

Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ QList<QgsLayerTreeLayer *> QgsLayerTreeGroup::findLayers() const`
`221`	`221`	`QList<QgsLayerTreeLayer *> list;`
`222`	`222`	`Q_FOREACH ( QgsLayerTreeNode *child, mChildren )`
`223`	`223`	`{`
`224`		`- if ( QgsLayerTree::isLayer( child ) )`
	`224`	`+ if ( QgsLayerTree::isLayer( child ) && QgsLayerTree::toLayer( child )->layer( ) )`
`225`	`225`	`list << QgsLayerTree::toLayer( child );`
`226`	`226`	`else if ( QgsLayerTree::isGroup( child ) )`
`227`	`227`	`list << QgsLayerTree::toGroup( child )->findLayers();`