highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-12 23:18:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant stopThread() signal

Browse Source
This commit is contained in:
Hennadii Stepanov
2018-09-18 01:17:22 +03:00
parent 5da08e0ac5
commit 1c0e0a5e38
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/qt/bitcoin.cpp
View File

@@ -212,7 +212,7 @@ BitcoinApplication::~BitcoinApplication()
if(coreThread) if(coreThread)
{ {
qDebug() << __func__ << ": Stopping thread"; qDebug() << __func__ << ": Stopping thread";
Q_EMIT stopThread(); coreThread->quit();
coreThread->wait(); coreThread->wait();
qDebug() << __func__ << ": Stopped thread"; qDebug() << __func__ << ": Stopped thread";
} }
@@ -279,8 +279,7 @@ void BitcoinApplication::startThread()
connect(this, &BitcoinApplication::requestedInitialize, executor, &BitcoinCore::initialize); connect(this, &BitcoinApplication::requestedInitialize, executor, &BitcoinCore::initialize);
connect(this, &BitcoinApplication::requestedShutdown, executor, &BitcoinCore::shutdown); connect(this, &BitcoinApplication::requestedShutdown, executor, &BitcoinCore::shutdown);
/* make sure executor object is deleted in its own thread */ /* make sure executor object is deleted in its own thread */
connect(this, &BitcoinApplication::stopThread, executor, &QObject::deleteLater); connect(coreThread, &QThread::finished, executor, &QObject::deleteLater);
connect(this, &BitcoinApplication::stopThread, coreThread, &QThread::quit);
coreThread->start(); coreThread->start();
} }

1
src/qt/bitcoin.h
View File

@@ -99,7 +99,6 @@ public Q_SLOTS:
Q_SIGNALS: Q_SIGNALS:
void requestedInitialize(); void requestedInitialize();
void requestedShutdown(); void requestedShutdown();
void stopThread();
void splashFinished(); void splashFinished();
void windowShown(BitcoinGUI* window); void windowShown(BitcoinGUI* window);

5
src/qt/intro.cpp
View File

@@ -158,7 +158,7 @@ Intro::~Intro()
{ {
delete ui; delete ui;
/* Ensure thread is finished before it is deleted */ /* Ensure thread is finished before it is deleted */
Q_EMIT stopThread(); thread->quit();
thread->wait(); thread->wait();
} }
@@ -306,8 +306,7 @@ void Intro::startThread()
connect(executor, &FreespaceChecker::reply, this, &Intro::setStatus); connect(executor, &FreespaceChecker::reply, this, &Intro::setStatus);
connect(this, &Intro::requestCheck, executor, &FreespaceChecker::check); connect(this, &Intro::requestCheck, executor, &FreespaceChecker::check);
/* make sure executor object is deleted in its own thread */ /* make sure executor object is deleted in its own thread */
connect(this, &Intro::stopThread, executor, &QObject::deleteLater); connect(thread, &QThread::finished, executor, &QObject::deleteLater);
connect(this, &Intro::stopThread, thread, &QThread::quit);
thread->start(); thread->start();
} }

1
src/qt/intro.h
View File

@@ -54,7 +54,6 @@ public:
Q_SIGNALS: Q_SIGNALS:
void requestCheck(); void requestCheck();
void stopThread();
public Q_SLOTS: public Q_SLOTS:
void setStatus(int status, const QString &message, quint64 bytesAvailable); void setStatus(int status, const QString &message, quint64 bytesAvailable);