From 112895fddc8ab4827868d9d07ec692a68963f87e Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 24 Mar 2020 15:06:34 +0100
Subject: [PATCH] [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.
---
 src/libcalamares/JobQueue.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/libcalamares/JobQueue.cpp b/src/libcalamares/JobQueue.cpp
index cf9d9ad65..209c4a416 100644
--- a/src/libcalamares/JobQueue.cpp
+++ b/src/libcalamares/JobQueue.cpp
@@ -69,6 +69,7 @@ public:
             if ( anyFailed && !job->isEmergency() )
             {
                 cDebug() << "Skipping non-emergency job" << job->prettyName();
+                ++m_jobIndex;
                 continue;
             }
 
@@ -83,10 +84,8 @@ public:
                 message = result.message();
                 details = result.details();
             }
-            if ( !anyFailed )
-            {
-                ++m_jobIndex;
-            }
+            emitProgress( 1.0 );
+            ++m_jobIndex;
         }
         if ( anyFailed )
         {