Merge pull request #4744 from Chocobo1/splash_scrn

Fix potential race condition in showSplashScreen()
This commit is contained in:
sledgehammer999 2016-02-09 09:50:22 -06:00
commit f37aed868e
2 changed files with 2 additions and 2 deletions

View file

@ -354,8 +354,8 @@ void showSplashScreen()
painter.setFont(QFont("Arial", 22, QFont::Black));
painter.drawText(224 - painter.fontMetrics().width(version), 270, version);
QSplashScreen *splash = new QSplashScreen(splash_img);
QTimer::singleShot(1500, splash, SLOT(deleteLater()));
splash->show();
QTimer::singleShot(1500, splash, SLOT(deleteLater()));
qApp->processEvents();
}
#endif

View file

@ -355,7 +355,7 @@ void Preferences::setStartMinimized(bool b)
bool Preferences::isSplashScreenDisabled() const
{
return value("Preferences/General/NoSplashScreen", false).toBool();
return value("Preferences/General/NoSplashScreen", true).toBool();
}
void Preferences::setSplashScreenDisabled(bool b)