Merge pull request #4744 from Chocobo1/splash_scrn

Fix potential race condition in showSplashScreen()

src/app/main.cpp

@@ -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

src/base/preferences.cpp

@@ -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)