flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-18 11:25:33 +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

10
src/blackgui/components/flightplancomponent.cpp
View File

@@ -413,7 +413,15 @@ namespace BlackGui
}
CFlightPlan fp;
fp.convertFromJson(json);
try
{
fp.convertFromJson(json);
}
catch (const CJsonException &ex)
{
m = ex.toStatusMessage(this, "Parse error in " + fileName);
break;
}
this->fillWithFlightPlanData(fp);
}
while (false);

11
src/blackgui/components/internalscomponent.cpp
View File

@@ -124,7 +124,16 @@ namespace BlackGui
CLogMessage(this).validationError("Parse error: %1") << jsonError.errorString();
return;
}
parts.convertFromJson(jsonDoc.object());
try
{
parts.convertFromJson(jsonDoc.object());
}
catch (const CJsonException &ex)
{
ex.toLogMessage(this, "Parse error");
return;
}
partsToGui(parts);
}
else