From 99d11f754f34a307c5132d1ab7201bc4a65f6a20 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 21 Feb 2022 12:12:20 +0100 Subject: [PATCH] [partition] Tighten up determining job labels for description --- src/modules/partition/PartitionViewStep.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/modules/partition/PartitionViewStep.cpp b/src/modules/partition/PartitionViewStep.cpp index 5e8bf2ef0..1eed8e2d7 100644 --- a/src/modules/partition/PartitionViewStep.cpp +++ b/src/modules/partition/PartitionViewStep.cpp @@ -216,7 +216,7 @@ diskDescription( int listLength, const PartitionCoreModule::SummaryInfo& info, C QString PartitionViewStep::prettyStatus() const { - QString jobsLabel, modeText, diskInfoLabel; + QString modeText, diskInfoLabel; const Config::InstallChoice choice = m_config->installChoice(); const QList< PartitionCoreModule::SummaryInfo > list = m_core->createSummaryInfo(); @@ -233,12 +233,7 @@ PartitionViewStep::prettyStatus() const diskInfoLabel = diskDescription( list.length(), info, choice ); } - const QStringList jobsLines = jobDescriptions( jobs() ); - if ( !jobsLines.isEmpty() ) - { - jobsLabel = jobsLines.join( "
" ); - } - + const QString jobsLabel = jobDescriptions( jobs() ).join( QStringLiteral( "
" ) ); return diskInfoLabel + "
" + jobsLabel; }