Cleanup group layers when groups are removed

nyalldawson · nyalldawson · commit 01ca203193fe · 2021-11-25T14:23:57.000+11:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -12180,7 +12180,7 @@ void QgisApp::removeLayer()
     return;
   }
 
-  QList<QgsLayerTreeNode *> selectedNodes = mLayerTreeView->selectedNodes( true );
+  const QList<QgsLayerTreeNode *> selectedNodes = mLayerTreeView->selectedNodes( true );
 
   //validate selection
   if ( selectedNodes.isEmpty() )
@@ -12221,7 +12221,7 @@ void QgisApp::removeLayer()
     }
   };
 
-  for ( const auto &n : std::as_const( selectedNodes ) )
+  for ( const QgsLayerTreeNode *n : selectedNodes )
   {
     harvest( n );
   }
@@ -12243,9 +12243,15 @@ void QgisApp::removeLayer()
     return;
   }
 
-  const auto constSelectedNodes = selectedNodes;
-  for ( QgsLayerTreeNode *node : constSelectedNodes )
+  for ( QgsLayerTreeNode *node : selectedNodes )
   {
+    if ( QgsLayerTreeGroup *group = qobject_cast< QgsLayerTreeGroup * >( node ) )
+    {
+      if ( QgsGroupLayer *groupLayer = group->groupLayer() )
+      {
+        QgsProject::instance()->removeMapLayer( groupLayer );
+      }
+    }
     QgsLayerTreeGroup *parentGroup = qobject_cast<QgsLayerTreeGroup *>( node->parent() );
     if ( parentGroup )
       parentGroup->removeChildNode( node );

Original file line number	Diff line number	Diff line change
`@@ -12180,7 +12180,7 @@ void QgisApp::removeLayer()`
`12180`	`12180`	`return;`
`12181`	`12181`	`}`
`12182`	`12182`
`12183`		`- QList<QgsLayerTreeNode *> selectedNodes = mLayerTreeView->selectedNodes( true );`
	`12183`	`+ const QList<QgsLayerTreeNode *> selectedNodes = mLayerTreeView->selectedNodes( true );`
`12184`	`12184`
`12185`	`12185`	`//validate selection`
`12186`	`12186`	`if ( selectedNodes.isEmpty() )`
`@@ -12221,7 +12221,7 @@ void QgisApp::removeLayer()`
`12221`	`12221`	`}`
`12222`	`12222`	`};`
`12223`	`12223`
`12224`		`- for ( const auto &n : std::as_const( selectedNodes ) )`
	`12224`	`+ for ( const QgsLayerTreeNode *n : selectedNodes )`
`12225`	`12225`	`{`
`12226`	`12226`	`harvest( n );`
`12227`	`12227`	`}`
`@@ -12243,9 +12243,15 @@ void QgisApp::removeLayer()`
`12243`	`12243`	`return;`
`12244`	`12244`	`}`
`12245`	`12245`
`12246`		`- const auto constSelectedNodes = selectedNodes;`
`12247`		`- for ( QgsLayerTreeNode *node : constSelectedNodes )`
	`12246`	`+ for ( QgsLayerTreeNode *node : selectedNodes )`
`12248`	`12247`	`{`
	`12248`	`+ if ( QgsLayerTreeGroup group = qobject_cast< QgsLayerTreeGroup >( node ) )`
	`12249`	`+ {`
	`12250`	`+ if ( QgsGroupLayer *groupLayer = group->groupLayer() )`
	`12251`	`+ {`
	`12252`	`+ QgsProject::instance()->removeMapLayer( groupLayer );`
	`12253`	`+ }`
	`12254`	`+ }`
`12249`	`12255`	`QgsLayerTreeGroup parentGroup = qobject_cast<QgsLayerTreeGroup >( node->parent() );`
`12250`	`12256`	`if ( parentGroup )`
`12251`	`12257`	`parentGroup->removeChildNode( node );`