Skip to content

Commit 252f363

Browse files
committed
qt: Replace QCoreApplication::quit() with QCoreApplication::exit(0)
Qt 5: - no behavior change Qt 6: - this change avoids sending a duplicated `QEvent::Quit`
1 parent d1b3dfb commit 252f363

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/qt/bitcoin.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,9 @@ void BitcoinApplication::startThread()
308308

309309
/* communication to and from thread */
310310
connect(&m_executor.value(), &InitExecutor::initializeResult, this, &BitcoinApplication::initializeResult);
311-
connect(&m_executor.value(), &InitExecutor::shutdownResult, this, &QCoreApplication::quit);
311+
connect(&m_executor.value(), &InitExecutor::shutdownResult, this, [] {
312+
QCoreApplication::exit(0);
313+
});
312314
connect(&m_executor.value(), &InitExecutor::runawayException, this, &BitcoinApplication::handleRunawayException);
313315
connect(this, &BitcoinApplication::requestedInitialize, &m_executor.value(), &InitExecutor::initialize);
314316
connect(this, &BitcoinApplication::requestedShutdown, &m_executor.value(), &InitExecutor::shutdown);

src/qt/test/apptests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,6 @@ AppTests::HandleCallback::~HandleCallback()
119119
assert(it != callbacks.end());
120120
callbacks.erase(it);
121121
if (callbacks.empty()) {
122-
m_app_tests.m_app.quit();
122+
m_app_tests.m_app.exit(0);
123123
}
124124
}

0 commit comments

Comments
 (0)