flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-18 03:15:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Longer time out in dev.build

Browse Source
This commit is contained in:
Klaus Basan
2019-04-08 02:52:52 +02:00
committed by Mat Sutcliffe
parent 50d886791a
commit 28b6f484e4
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blackcore/webdataservices.cpp
View File

@@ -30,6 +30,7 @@
#include "blackmisc/statusmessage.h" #include "blackmisc/statusmessage.h"
#include "blackmisc/worker.h" #include "blackmisc/worker.h"
#include "blackmisc/threadutils.h" #include "blackmisc/threadutils.h"
#include "blackconfig/buildconfig.h"
#include <QDir> #include <QDir>
#include <QFlags> #include <QFlags>
@@ -45,6 +46,7 @@ using namespace BlackCore::Db;
using namespace BlackCore::Data; using namespace BlackCore::Data;
using namespace BlackCore::Vatsim; using namespace BlackCore::Vatsim;
using namespace BlackCore::Context; using namespace BlackCore::Context;
using namespace BlackConfig;
using namespace BlackMisc; using namespace BlackMisc;
using namespace BlackMisc::Db; using namespace BlackMisc::Db;
using namespace BlackMisc::Simulation; using namespace BlackMisc::Simulation;
@@ -1409,8 +1411,12 @@ namespace BlackCore
if (m_shuttingDown) { return false; } if (m_shuttingDown) { return false; }
Q_ASSERT_X(m_dbInfoDataReader, Q_FUNC_INFO, "need reader"); Q_ASSERT_X(m_dbInfoDataReader, Q_FUNC_INFO, "need reader");
// in a dev build all symbols are loaded which sometimes causes unnecessary timeout
const int timeOutMs = CBuildConfig::isLocalDeveloperDebugBuild() ? 30 * 1000 : 15 * 1000;
if (m_dbInfoDataReader->areAllInfoObjectsRead()) { return true; } if (m_dbInfoDataReader->areAllInfoObjectsRead()) { return true; }
if (!m_dbInfoObjectTimeout.isValid()) { m_dbInfoObjectTimeout = QDateTime::currentDateTimeUtc().addMSecs(15 * 1000); } if (!m_dbInfoObjectTimeout.isValid()) { m_dbInfoObjectTimeout = QDateTime::currentDateTimeUtc().addMSecs(timeOutMs); }
const bool read = this->waitForInfoObjectsThenRead(entities, "DB", m_dbInfoDataReader, m_dbInfoObjectTimeout); const bool read = this->waitForInfoObjectsThenRead(entities, "DB", m_dbInfoDataReader, m_dbInfoObjectTimeout);
return read; return read;
} }