Skip to content

Commit 11f3eac

Browse files
committed
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
2 parents 36a927c + 1e5d14b commit 11f3eac

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/qt/bitcoin.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -516,13 +516,14 @@ void BitcoinApplication::initializeResult(bool success)
516516
#endif
517517
pollShutdownTimer->start(200);
518518
} else {
519-
quit(); // Exit main loop
519+
Q_EMIT splashFinished(window); // Make sure splash screen doesn't stick around during shutdown
520+
quit(); // Exit first main loop invocation
520521
}
521522
}
522523

523524
void BitcoinApplication::shutdownResult()
524525
{
525-
quit(); // Exit main loop after shutdown finished
526+
quit(); // Exit second main loop invocation after shutdown finished
526527
}
527528

528529
void BitcoinApplication::handleRunawayException(const QString &message)

0 commit comments

Comments
 (0)