Fixed problem on Linux. Hopfully did not break Windows.

2014-01-05 01:28:12 +01:00
parent fce51a6945
commit 353eab083f
3 changed files with 18 additions and 11 deletions
@@ -116,14 +116,15 @@ int main(int argc, char *argv[])
    current_firmware_variant = GetFirmwareVariant(firmware_id);
    // qDebug() << current_firmware_variant;

+    MainWindow mainWin;
+	
    if (showSplash) {
      splash->show();
-      splash->showMessage(QObject::tr(""));
-      sleep(SPLASH_TIME);
+      QTimer::singleShot(1000*SPLASH_TIME, splash, SLOT(close()));
+      QTimer::singleShot(1000*SPLASH_TIME, &mainWin, SLOT(show()));
+    }
+    else  {
+      mainWin.show();
    }
-
-    MainWindow mainWin;
-    mainWin.show();
-    splash->finish(&mainWin);
    return app.exec();
 }