Browse Source

Fix loading of old GeoFence files

QGC4.4
Don Gagne 6 years ago
parent
commit
a2261737ac
  1. 5
      src/MissionManager/GeoFenceController.cc

5
src/MissionManager/GeoFenceController.cc

@ -123,8 +123,9 @@ bool GeoFenceController::load(const QJsonObject& json, QString& errorString) @@ -123,8 +123,9 @@ bool GeoFenceController::load(const QJsonObject& json, QString& errorString)
errorString.clear();
if (json.contains(JsonHelper::jsonVersionKey) && json[JsonHelper::jsonVersionKey].toInt() == 1) {
// We just ignore old version 1 data
if (!json.contains(JsonHelper::jsonVersionKey) ||
(json.contains(JsonHelper::jsonVersionKey) && json[JsonHelper::jsonVersionKey].toInt() == 1)) {
// We just ignore old version 1 or prior data
return true;
}

Loading…
Cancel
Save