|
|
@ -217,7 +217,7 @@ Q_SIGNALS:
|
|
|
|
void requestedInitialize();
|
|
|
|
void requestedInitialize();
|
|
|
|
void requestedShutdown();
|
|
|
|
void requestedShutdown();
|
|
|
|
void stopThread();
|
|
|
|
void stopThread();
|
|
|
|
void splashFinished(QWidget *window);
|
|
|
|
void splashFinished();
|
|
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
private:
|
|
|
|
QThread *coreThread;
|
|
|
|
QThread *coreThread;
|
|
|
@ -357,9 +357,9 @@ void BitcoinApplication::createSplashScreen(const NetworkStyle *networkStyle)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
SplashScreen *splash = new SplashScreen(m_node, 0, networkStyle);
|
|
|
|
SplashScreen *splash = new SplashScreen(m_node, 0, networkStyle);
|
|
|
|
// We don't hold a direct pointer to the splash screen after creation, but the splash
|
|
|
|
// We don't hold a direct pointer to the splash screen after creation, but the splash
|
|
|
|
// screen will take care of deleting itself when slotFinish happens.
|
|
|
|
// screen will take care of deleting itself when finish() happens.
|
|
|
|
splash->show();
|
|
|
|
splash->show();
|
|
|
|
connect(this, &BitcoinApplication::splashFinished, splash, &SplashScreen::slotFinish);
|
|
|
|
connect(this, &BitcoinApplication::splashFinished, splash, &SplashScreen::finish);
|
|
|
|
connect(this, &BitcoinApplication::requestedShutdown, splash, &QWidget::close);
|
|
|
|
connect(this, &BitcoinApplication::requestedShutdown, splash, &QWidget::close);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -500,7 +500,7 @@ void BitcoinApplication::initializeResult(bool success)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
window->show();
|
|
|
|
window->show();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Q_EMIT splashFinished(window);
|
|
|
|
Q_EMIT splashFinished();
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef ENABLE_WALLET
|
|
|
|
#ifdef ENABLE_WALLET
|
|
|
|
// Now that initialization/startup is done, process any command-line
|
|
|
|
// Now that initialization/startup is done, process any command-line
|
|
|
@ -514,7 +514,7 @@ void BitcoinApplication::initializeResult(bool success)
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
pollShutdownTimer->start(200);
|
|
|
|
pollShutdownTimer->start(200);
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
Q_EMIT splashFinished(window); // Make sure splash screen doesn't stick around during shutdown
|
|
|
|
Q_EMIT splashFinished(); // Make sure splash screen doesn't stick around during shutdown
|
|
|
|
quit(); // Exit first main loop invocation
|
|
|
|
quit(); // Exit first main loop invocation
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|