mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-12 23:18:14 +01:00
Merge #14250: qt: Remove redundant stopThread() and stopExecutor() signals
24313fbf7eRemove redundant stopExecutor() signal (Hennadii Stepanov)1c0e0a5e38Remove redundant stopThread() signal (Hennadii Stepanov) Pull request description: The `QThread::finished` signal do this work. Tree-SHA512: 1afce23d30232276d50c3af5af79d83b88e390a2b71f7df585cc1079585d330447d179bbc34c0a89599beb2da035dfd5b9ce23238171490825cabc3a19ae6e67
This commit is contained in:
@@ -156,7 +156,7 @@ Intro::~Intro()
|
||||
{
|
||||
delete ui;
|
||||
/* Ensure thread is finished before it is deleted */
|
||||
Q_EMIT stopThread();
|
||||
thread->quit();
|
||||
thread->wait();
|
||||
}
|
||||
|
||||
@@ -311,8 +311,7 @@ void Intro::startThread()
|
||||
connect(executor, &FreespaceChecker::reply, this, &Intro::setStatus);
|
||||
connect(this, &Intro::requestCheck, executor, &FreespaceChecker::check);
|
||||
/* make sure executor object is deleted in its own thread */
|
||||
connect(this, &Intro::stopThread, executor, &QObject::deleteLater);
|
||||
connect(this, &Intro::stopThread, thread, &QThread::quit);
|
||||
connect(thread, &QThread::finished, executor, &QObject::deleteLater);
|
||||
|
||||
thread->start();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user