From 32649f78eae77e38c4278adc8bc96821c8927470 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 3 Sep 2020 15:39:04 +0200 Subject: [PATCH] [libcalamares] Restore finish() slot to job queue FIXES #1507 --- src/libcalamares/JobQueue.cpp | 1 + src/libcalamares/JobQueue.h | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/libcalamares/JobQueue.cpp b/src/libcalamares/JobQueue.cpp index 172d59714..17ea6a141 100644 --- a/src/libcalamares/JobQueue.cpp +++ b/src/libcalamares/JobQueue.cpp @@ -135,6 +135,7 @@ public: { emitProgress( 1.0 ); } + m_runningJobs->clear(); QMetaObject::invokeMethod( m_queue, "finish", Qt::QueuedConnection ); } diff --git a/src/libcalamares/JobQueue.h b/src/libcalamares/JobQueue.h index 518217000..5c4c6c35f 100644 --- a/src/libcalamares/JobQueue.h +++ b/src/libcalamares/JobQueue.h @@ -77,9 +77,15 @@ signals: */ void queueChanged( const QStringList& jobNames ); -private: +public slots: + /** @brief Implementation detail + * + * This is a private implementation detail for the job thread, + * which should not be called by other core. + */ void finish(); +private: static JobQueue* s_instance; JobThread* m_thread;