From bf761e363fe4cfb4e8b9ba365b7e61ca35879a06 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Wed, 3 May 2017 21:17:51 -0700 Subject: [PATCH] Fix loading of old .mission file format --- src/MissionManager/MissionController.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/MissionManager/MissionController.cc b/src/MissionManager/MissionController.cc index d1e4f9bc9..7f0e39816 100644 --- a/src/MissionManager/MissionController.cc +++ b/src/MissionManager/MissionController.cc @@ -500,7 +500,7 @@ bool MissionController::_loadJsonMissionFileV2(const QJsonObject& json, QmlObjec { _jsonPlannedHomePositionKey, QJsonValue::Array, true }, { _jsonItemsKey, QJsonValue::Array, true }, { _jsonFirmwareTypeKey, QJsonValue::Double, true }, - { _jsonVehicleTypeKey, QJsonValue::Double, true }, + { _jsonVehicleTypeKey, QJsonValue::Double, false }, { _jsonCruiseSpeedKey, QJsonValue::Double, false }, { _jsonHoverSpeedKey, QJsonValue::Double, false }, }; @@ -515,8 +515,10 @@ bool MissionController::_loadJsonMissionFileV2(const QJsonObject& json, QmlObjec if (_masterController->offline()) { // We only update if offline since if we are online we use the online vehicle settings - appSettings->offlineEditingFirmwareType()->setRawValue(AppSettings::offlineEditingFirmwareTypeFromFirmwareType((MAV_AUTOPILOT)json[_jsonVehicleTypeKey].toInt())); - appSettings->offlineEditingVehicleType()->setRawValue(AppSettings::offlineEditingVehicleTypeFromVehicleType((MAV_TYPE)json[_jsonVehicleTypeKey].toInt())); + appSettings->offlineEditingFirmwareType()->setRawValue(AppSettings::offlineEditingFirmwareTypeFromFirmwareType((MAV_AUTOPILOT)json[_jsonFirmwareTypeKey].toInt())); + if (json.contains(_jsonVehicleTypeKey)) { + appSettings->offlineEditingVehicleType()->setRawValue(AppSettings::offlineEditingVehicleTypeFromVehicleType((MAV_TYPE)json[_jsonVehicleTypeKey].toInt())); + } } if (json.contains(_jsonCruiseSpeedKey)) { appSettings->offlineEditingCruiseSpeed()->setRawValue(json[_jsonCruiseSpeedKey].toDouble()); -- 2.22.0