refs #853, JSON exception handling adjustments for model reader

This commit is contained in:
Klaus Basan
2017-01-05 19:39:27 +01:00
committed by Mathew Sutcliffe
parent e956986bf4
commit b0bef3264c
3 changed files with 89 additions and 36 deletions

View File

@@ -1203,9 +1203,10 @@ namespace BlackCore
}
if (s && this->m_modelDataReader)
{
s = inBackground ?
this->m_modelDataReader->readFromJsonFilesInBackground(dir) :
this->m_modelDataReader->readFromJsonFiles(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();
}
if (s && this->m_airportDataReader)
{