From 451ca244db8bc71ffc3cc9982d025f144cc8f3bc Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Mon, 7 Jun 2021 18:50:52 +0300 Subject: qt, refactor: Drop intermediate BitcoinApplication::shutdownResult slot --- src/qt/bitcoin.cpp | 7 +------ src/qt/bitcoin.h | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) (limited to 'src/qt') diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 8ae6db831f..e51c7d46f6 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -297,7 +297,7 @@ void BitcoinApplication::startThread() /* communication to and from thread */ connect(&m_executor.value(), &InitExecutor::initializeResult, this, &BitcoinApplication::initializeResult); - connect(&m_executor.value(), &InitExecutor::shutdownResult, this, &BitcoinApplication::shutdownResult); + connect(&m_executor.value(), &InitExecutor::shutdownResult, this, &QCoreApplication::quit); connect(&m_executor.value(), &InitExecutor::runawayException, this, &BitcoinApplication::handleRunawayException); connect(this, &BitcoinApplication::requestedInitialize, &m_executor.value(), &InitExecutor::initialize); connect(this, &BitcoinApplication::requestedShutdown, &m_executor.value(), &InitExecutor::shutdown); @@ -418,11 +418,6 @@ void BitcoinApplication::initializeResult(bool success, interfaces::BlockAndHead } } -void BitcoinApplication::shutdownResult() -{ - quit(); -} - void BitcoinApplication::handleRunawayException(const QString &message) { QMessageBox::critical( diff --git a/src/qt/bitcoin.h b/src/qt/bitcoin.h index 6c2c1c9ebc..116e941501 100644 --- a/src/qt/bitcoin.h +++ b/src/qt/bitcoin.h @@ -73,7 +73,6 @@ public Q_SLOTS: void initializeResult(bool success, interfaces::BlockAndHeaderTipInfo tip_info); /// Request core shutdown void requestShutdown(); - void shutdownResult(); /// Handle runaway exceptions. Shows a message box with the problem and quits the program. void handleRunawayException(const QString &message); -- cgit v1.2.3