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

refs #853, JSON exception handling adjustments for ICAO reader

Browse Source
This commit is contained in:
Klaus Basan
2017-01-05 23:55:47 +01:00
committed by Mathew Sutcliffe
parent b0bef3264c
commit e3197ce375
3 changed files with 93 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/blackcore/webdataservices.cpp
View File

@@ -1197,23 +1197,24 @@ namespace BlackCore
bool s = false;
if (this->m_icaoDataReader)
{
s = inBackground ?
this->m_icaoDataReader->readFromJsonFilesInBackground(dir) :
this->m_icaoDataReader->readFromJsonFiles(dir);
if (inBackground) { return this->m_icaoDataReader->readFromJsonFilesInBackground(dir); }
const CStatusMessageList msgs = this->m_icaoDataReader->readFromJsonFiles(dir);
if (msgs.isFailure()) { CLogMessage::preformatted(msgs); }
s = msgs.isSuccess();
}
if (s && this->m_modelDataReader)
{
if(inBackground) { return this->m_modelDataReader->readFromJsonFilesInBackground(dir); }
if (inBackground) { return this->m_modelDataReader->readFromJsonFilesInBackground(dir); }
const CStatusMessageList msgs = this->m_modelDataReader->readFromJsonFiles(dir);
if (msgs.isFailure()) { CLogMessage::preformatted(msgs); }
return msgs.isSuccess();
s = msgs.isSuccess();
}
if (s && this->m_airportDataReader)
{
if (inBackground) { return this->m_airportDataReader->readFromJsonFilesInBackground(dir); }
const CStatusMessageList msgs = this->m_airportDataReader->readFromJsonFiles(dir);
if (msgs.isFailure()) { CLogMessage::preformatted(msgs); }
return msgs.isSuccess();
s = msgs.isSuccess();
}
return s;
}