flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-26 02:35:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #815 Catch and handle CJsonException when calling convertFromJson.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2016-12-21 02:27:21 +00:00
parent 4f6d3ed3a3
commit 51c3ae8c25
8 changed files with 65 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/blackcore/airspacemonitor.cpp
View File

@@ -1148,16 +1148,25 @@ namespace BlackCore
if (!simAircraft.isPartsSynchronized() && !isFull) { return; }
CAircraftParts parts;
if (isFull)
try
{
parts.convertFromJson(jsonObject);
if (isFull)
{
parts.convertFromJson(jsonObject);
}
else
{
// incremental update
parts = this->remoteAircraftParts(callsign).frontOrDefault();
QJsonObject config = applyIncrementalObject(parts.toJson(), jsonObject);
parts.convertFromJson(config);
}
}
else
catch (const CJsonException &ex)
{
// incremental update
parts = this->remoteAircraftParts(callsign).frontOrDefault();
QJsonObject config = applyIncrementalObject(parts.toJson(), jsonObject);
parts.convertFromJson(config);
CStatusMessage message = ex.toStatusMessage(this, "Invalid parts packet");
message.setSeverity(CStatusMessage::SeverityDebug);
CLogMessage::preformatted(message);
}
// make sure in any case right time

2
src/blackcore/application.cpp
View File

@@ -175,7 +175,7 @@ namespace BlackCore
CApplicationInfoList CApplication::getRunningApplications()
{
CApplicationInfoList apps;
apps.convertFromJson(CFileUtils::readLockedFileToString(swiftDataRoot() + "apps.json"));
apps.convertFromJsonNoThrow(CFileUtils::readLockedFileToString(swiftDataRoot() + "apps.json"), {}, {});
apps.removeIf([](const CApplicationInfo &info) { return !info.processInfo().exists(); });
return apps;
}