From a2261737ac3288cdad559474afdde892b3095363 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Wed, 3 Oct 2018 09:36:48 -0700 Subject: [PATCH] Fix loading of old GeoFence files --- src/MissionManager/GeoFenceController.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/MissionManager/GeoFenceController.cc b/src/MissionManager/GeoFenceController.cc index 254790b3d..228ba04e8 100644 --- a/src/MissionManager/GeoFenceController.cc +++ b/src/MissionManager/GeoFenceController.cc @@ -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; } -- 2.22.0