Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-25 17:25:13 +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

12
companion/src/mainwindow.cpp
View file

@ -112,9 +112,15 @@ downloadDialog_forWait(NULL)
QNetworkProxyFactory::setUseSystemConfiguration(true);
setAcceptDrops(true);
// give time to the main windows to open before starting updates, delay 1s
QTimer::singleShot(1000, this, SLOT(doAutoUpdates()));
QTimer::singleShot(1000, this, SLOT(displayWarnings()));
// give time to the splash to disappear and main window to open before starting updates
int updateDelay = 1000;
QSettings settings("companion9x", "companion9x");
bool showSplash = settings.value("show_splash", true).toBool();
if (showSplash)
updateDelay += (SPLASH_TIME*1000);
QTimer::singleShot(updateDelay, this, SLOT(doAutoUpdates()));
QTimer::singleShot(updateDelay, this, SLOT(displayWarnings()));
QStringList strl = QApplication::arguments();
QString str;
QString printfilename;