Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-05-29 21:42:32 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Remove redundant stopExecutor() signal

Browse Source
This commit is contained in:
Hennadii Stepanov 2018-10-21 15:10:16 +03:00
parent 1c0e0a5e38
commit 24313fbf7e
No known key found for this signature in database
GPG Key ID: 410108112E7EA81F
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/qt/rpcconsole.cpp
View File

@ -688,8 +688,7 @@ void RPCConsole::setClientModel(ClientModel *model)
} }
if (!model) { if (!model) {
// Client model is being set to 0, this means shutdown() is about to be called. // Client model is being set to 0, this means shutdown() is about to be called.
// Make sure we clean up the executor thread thread.quit();
Q_EMIT stopExecutor();
thread.wait(); thread.wait();
} }
} }
@ -975,11 +974,8 @@ void RPCConsole::startExecutor()
// Requests from this object must go to executor // Requests from this object must go to executor
connect(this, &RPCConsole::cmdRequest, executor, &RPCExecutor::request); connect(this, &RPCConsole::cmdRequest, executor, &RPCExecutor::request);
// On stopExecutor signal // Make sure executor object is deleted in its own thread
// - quit the Qt event loop in the execution thread connect(&thread, &QThread::finished, executor, &RPCExecutor::deleteLater);
connect(this, &RPCConsole::stopExecutor, &thread, &QThread::quit);
// - queue executor for deletion (in execution thread)
connect(&thread, &QThread::finished, executor, &RPCExecutor::deleteLater, Qt::DirectConnection);
// Default implementation of QThread::run() simply spins up an event loop in the thread, // Default implementation of QThread::run() simply spins up an event loop in the thread,
// which is what we want. // which is what we want.

1
src/qt/rpcconsole.h
View File

@ -132,7 +132,6 @@ public Q_SLOTS:
Q_SIGNALS: Q_SIGNALS:
// For RPC command executor // For RPC command executor
void stopExecutor();
void cmdRequest(const QString &command, const WalletModel* wallet_model); void cmdRequest(const QString &command, const WalletModel* wallet_model);
private: private: