diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-02-08 08:52:39 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-02-08 08:53:06 +0100 |
| commit | 11f3eac793348ee8e578838926c6dbae772cb8e5 (patch) | |
| tree | 9d981492f2b774dd9c64cc6b238f0edd846e5e81 | |
| parent | 36a927c52585b9c263811799f76f5a164a909b9d (diff) | |
| parent | 1e5d14b3f7db814505279d346f0b819443753e66 (diff) | |
| download | bitcoin-11f3eac793348ee8e578838926c6dbae772cb8e5.tar.xz | |
Merge #12374: qt: Make sure splash screen is freed on AppInitMain fail
1e5d14b qt: Clarify some comments (Wladimir J. van der Laan)
f5a4c3d qt: Make sure splash screen is freed on AppInitMain fail (Wladimir J. van der Laan)
Pull request description:
The `splashFinished` event was never sent if AppInitMain fails, causing the splash screen to stick around, causing problems later.
This bug has existed for a while but is now trigging potential crashed because the splash screen subscribes to wallet events.
Meant to fix #12372.
Tree-SHA512: 192a7e3a528015e771d7860dd95fd7b772292fd8064abf2a3cf3a8ea0d375cd43a6e8ed37ca1a38962fe1410c934599e557adf6a8ef9d87ec7f61b6e5fd8db7e
| -rw-r--r-- | src/qt/bitcoin.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 8fd857e01f..e4c088d379 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -516,13 +516,14 @@ void BitcoinApplication::initializeResult(bool success) #endif pollShutdownTimer->start(200); } else { - quit(); // Exit main loop + Q_EMIT splashFinished(window); // Make sure splash screen doesn't stick around during shutdown + quit(); // Exit first main loop invocation } } void BitcoinApplication::shutdownResult() { - quit(); // Exit main loop after shutdown finished + quit(); // Exit second main loop invocation after shutdown finished } void BitcoinApplication::handleRunawayException(const QString &message) |