Don't show prompt on empty group

qgis · Jan 21, 2017 · 2bedaf8 · 2bedaf8
1 parent 72551fb
commit 2bedaf8
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -8502,6 +8502,15 @@ void QgisApp::removeLayer()
   }
 
   bool promptConfirmation = QSettings().value( QStringLiteral( "qgis/askToDeleteLayers" ), true ).toBool();
+
+  // Don't show prompt to remove a empty group.
+  if ( selectedNodes.count() == 1
+       && selectedNodes.at( 0 )->nodeType() == QgsLayerTreeNode::NodeGroup
+       && selectedNodes.at( 0 )->children().count() == 0 )
+  {
+    promptConfirmation = false;
+  }
+
   bool shiftHeld = QApplication::queryKeyboardModifiers().testFlag( Qt::ShiftModifier );
   //display a warning
   if ( !shiftHeld && promptConfirmation && QMessageBox::warning( this, tr( "Remove layers and groups" ), tr( "Remove %n legend entries?", "number of legend items to remove", selectedNodes.count() ), QMessageBox::Ok | QMessageBox::Cancel ) == QMessageBox::Cancel )