From 74a3a2da78ec59996fa313b894c40f5fec2d07ea Mon Sep 17 00:00:00 2001 From: Artem Grinev Date: Thu, 12 Aug 2021 02:13:16 +0400 Subject: [PATCH] [partition] Fix Delete button for extended Extended partition can't be removed when contains children. This commit adds missing check. --- src/modules/partition/gui/PartitionPage.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/modules/partition/gui/PartitionPage.cpp b/src/modules/partition/gui/PartitionPage.cpp index f5a3b0f43..3e2bb4bd1 100644 --- a/src/modules/partition/gui/PartitionPage.cpp +++ b/src/modules/partition/gui/PartitionPage.cpp @@ -139,6 +139,11 @@ PartitionPage::updateButtons() bool isFree = CalamaresUtils::Partition::isPartitionFreeSpace( partition ); bool isExtended = partition->roles().has( PartitionRole::Extended ); + bool hasChildren = isExtended + && ( partition->children().length() > 1 + || ( partition->children().length() == 1 + && !CalamaresUtils::Partition::isPartitionFreeSpace( partition->children().at( 0 ) ) ) ); + bool isInVG = m_core->isInVG( partition ); create = isFree; @@ -151,7 +156,7 @@ PartitionPage::updateButtons() // order. // TODO: See if LVM PVs can be edited in Calamares edit = !isFree && !isExtended; - del = !isFree && !isInVG; + del = !isFree && !isInVG && !hasChildren; } if ( m_ui->deviceComboBox->currentIndex() >= 0 )