From 40e8ff49411947b2705237365e5a81cbd7447da3 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sat, 2 Apr 2016 18:57:24 -0700 Subject: [PATCH] Fix SimpleMissionItem resetting default values over coordinate --- src/MissionManager/MissionItem.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/MissionManager/MissionItem.cc b/src/MissionManager/MissionItem.cc index ffb11d92f..5eb6d465a 100644 --- a/src/MissionManager/MissionItem.cc +++ b/src/MissionManager/MissionItem.cc @@ -203,6 +203,10 @@ bool MissionItem::load(const QJsonObject& json, QString& errorString) return false; } + // Make sure to set these first since they can signal other changes + setFrame((MAV_FRAME)json[_jsonFrameKey].toInt()); + setCommand((MAV_CMD)json[_jsonCommandKey].toInt()); + QGeoCoordinate coordinate; if (!JsonHelper::toQGeoCoordinate(json[_jsonCoordinateKey], coordinate, true /* altitudeRequired */, errorString)) { return false; @@ -213,8 +217,6 @@ bool MissionItem::load(const QJsonObject& json, QString& errorString) setIsCurrentItem(false); setSequenceNumber(json[_jsonIdKey].toInt()); - setFrame((MAV_FRAME)json[_jsonFrameKey].toInt()); - setCommand((MAV_CMD)json[_jsonCommandKey].toInt()); setParam1(json[_jsonParam1Key].toDouble()); setParam2(json[_jsonParam2Key].toDouble()); setParam3(json[_jsonParam3Key].toDouble()); -- 2.22.0