napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libcalamares] Restore finish() slot to job queue

Browse Source 
FIXES #1507
This commit is contained in:
Adriaan de Groot 2020-09-03 15:39:04 +02:00
parent 5ed57331d6
commit 32649f78ea
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libcalamares/JobQueue.cpp
View File

@ -135,6 +135,7 @@ public:
{ {
emitProgress( 1.0 ); emitProgress( 1.0 );
} }
m_runningJobs->clear();
QMetaObject::invokeMethod( m_queue, "finish", Qt::QueuedConnection ); QMetaObject::invokeMethod( m_queue, "finish", Qt::QueuedConnection );
} }

8
src/libcalamares/JobQueue.h
View File

@ -77,9 +77,15 @@ signals:
*/ */
void queueChanged( const QStringList& jobNames ); 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(); void finish();
private:
static JobQueue* s_instance; static JobQueue* s_instance;
JobThread* m_thread; JobThread* m_thread;