Merge branch 'origin/next'

2014-01-05 10:23:56 +01:00
parent e5ad887be9 370cec86a9
commit 7c9470a745
5 changed files with 21 additions and 18 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();
 }