flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 12:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #857, check if network is accessible in readers

Browse Source 
* new read state "skipped"
* renamed to "isNetworkConnectedAndAccessible"
* checking before reading, which would only fail if network is not accessible
This commit is contained in:
Klaus Basan
2017-01-12 18:07:35 +01:00
committed by Mathew Sutcliffe
parent 04e980a6ae
commit 1ced7f3c0b
14 changed files with 49 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/blackcore/db/modeldatareader.cpp
View File

@@ -147,13 +147,19 @@ namespace BlackCore
getDistributorsCount() > 0;
}
void CModelDataReader::ps_read(CEntityFlags::Entity entity, CDbFlags::DataRetrievalModeFlag mode, const QDateTime &newerThan)
void CModelDataReader::ps_read(CEntityFlags::Entity entities, CDbFlags::DataRetrievalModeFlag mode, const QDateTime &newerThan)
{
this->threadAssertCheck();
if (this->isShuttingDown()) { return; }
entities &= CEntityFlags::DistributorLiveryModel;
if (!this->isNetworkConnectedAndAccessible())
{
emit this->dataRead(entities, CEntityFlags::ReadSkipped, 0);
return;
}
CEntityFlags::Entity triggeredRead = CEntityFlags::NoEntity;
if (entity.testFlag(CEntityFlags::LiveryEntity))
if (entities.testFlag(CEntityFlags::LiveryEntity))
{
CUrl url(getLiveryUrl(mode));
if (!url.isEmpty())
@@ -172,7 +178,7 @@ namespace BlackCore
}
}
if (entity.testFlag(CEntityFlags::DistributorEntity))
if (entities.testFlag(CEntityFlags::DistributorEntity))
{
CUrl url(getDistributorUrl(mode));
if (!url.isEmpty())
@@ -191,7 +197,7 @@ namespace BlackCore
}
}
if (entity.testFlag(CEntityFlags::ModelEntity))
if (entities.testFlag(CEntityFlags::ModelEntity))
{
CUrl url(getModelUrl(mode));
if (!url.isEmpty())