Skip to content

Commit

Permalink
Merge bitcoin#12374: qt: Make sure splash screen is freed on AppInitM…
Browse files Browse the repository at this point in the history
…ain 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 bitcoin#12372.

Tree-SHA512: 192a7e3a528015e771d7860dd95fd7b772292fd8064abf2a3cf3a8ea0d375cd43a6e8ed37ca1a38962fe1410c934599e557adf6a8ef9d87ec7f61b6e5fd8db7e
  • Loading branch information
laanwj authored and PastaPastaPasta committed Mar 14, 2020
1 parent bf1d2ce commit 61bd9bd
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/qt/dash.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -553,13 +553,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)
Expand Down

0 comments on commit 61bd9bd

Please sign in to comment.