From 66da5f2fa480eb66c385a4f262161d0ff51e8f47 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 18 Nov 2020 17:27:50 +0100 Subject: [PATCH] [netinstall] Removing the last package should clear it out. FIXES #1577 --- src/modules/netinstall/NetInstallViewStep.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/modules/netinstall/NetInstallViewStep.cpp b/src/modules/netinstall/NetInstallViewStep.cpp index e96d1724f..d92058e51 100644 --- a/src/modules/netinstall/NetInstallViewStep.cpp +++ b/src/modules/netinstall/NetInstallViewStep.cpp @@ -139,6 +139,7 @@ NetInstallViewStep::onLeave() // Clear out existing operations for this module, going backwards: // Sometimes we remove an item, and we don't want the index to // fall off the end of the list. + bool somethingRemoved = false; for ( int index = packageOperations.length() - 1; 0 <= index; index-- ) { const QVariantMap op = packageOperations.at( index ).toMap(); @@ -146,6 +147,7 @@ NetInstallViewStep::onLeave() { cDebug() << Logger::SubEntry << "Removing existing operations for" << moduleInstanceKey(); packageOperations.removeAt( index ); + somethingRemoved = true; } } @@ -183,7 +185,7 @@ NetInstallViewStep::onLeave() cDebug() << Logger::SubEntry << tryInstallPackages.length() << "non-critical packages."; } - if ( !packageOperations.isEmpty() ) + if ( somethingRemoved || !packageOperations.isEmpty() ) { gs->insert( PACKAGEOP, packageOperations ); }