Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 09:45:21 +03:00
Code Issues Wiki Activity

Merge branch 'origin/next'

Browse source
This commit is contained in:
Dvogonen 2014-01-05 10:23:56 +01:00
commit 7c9470a745
5 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

13
companion/src/main.cpp
View file

@ -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();
}