[libcalamares] Keep jobIndex in-sync with the jobs

- Never skip updating the jobIndex, because it is used in emitProgress()
  to find which job to ask for status.
This commit is contained in:
Adriaan de Groot 2020-03-24 15:06:34 +01:00
parent 1ec7251275
commit 112895fddc

View File

@ -69,6 +69,7 @@ public:
if ( anyFailed && !job->isEmergency() ) if ( anyFailed && !job->isEmergency() )
{ {
cDebug() << "Skipping non-emergency job" << job->prettyName(); cDebug() << "Skipping non-emergency job" << job->prettyName();
++m_jobIndex;
continue; continue;
} }
@ -83,11 +84,9 @@ public:
message = result.message(); message = result.message();
details = result.details(); details = result.details();
} }
if ( !anyFailed ) emitProgress( 1.0 );
{
++m_jobIndex; ++m_jobIndex;
} }
}
if ( anyFailed ) if ( anyFailed )
{ {
emitFailed( message, details ); emitFailed( message, details );