From ba31ed3f24fe08100b4a0713b52d82bd5cad54ae Mon Sep 17 00:00:00 2001 From: DoinLakeFlyer Date: Thu, 5 Mar 2020 10:30:26 -0800 Subject: [PATCH 1/2] Clear wizard mode when loading from file --- src/MissionManager/TakeoffMissionItem.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/MissionManager/TakeoffMissionItem.cc b/src/MissionManager/TakeoffMissionItem.cc index a03306e..64dadaa 100644 --- a/src/MissionManager/TakeoffMissionItem.cc +++ b/src/MissionManager/TakeoffMissionItem.cc @@ -71,7 +71,7 @@ void TakeoffMissionItem::_init(void) _initLaunchTakeoffAtSameLocation(); if (homePosition.isValid() && coordinate().isValid()) { - // Item already full specified, most likely from mission load from storage + // Item already fully specified, most likely from mission load from storage _wizardMode = false; } else { if (_launchTakeoffAtSameLocation && homePosition.isValid()) { @@ -148,6 +148,7 @@ bool TakeoffMissionItem::load(const QJsonObject& json, int sequenceNumber, QStri if (success) { _initLaunchTakeoffAtSameLocation(); } + _wizardMode = false; // Should always be off for loaded items return success; } From 685cb036ad7168e8b3d29c40f94c867edb329863 Mon Sep 17 00:00:00 2001 From: DoinLakeFlyer Date: Thu, 5 Mar 2020 10:40:16 -0800 Subject: [PATCH 2/2] Wizard mode should be off for loaded items --- src/MissionManager/TakeoffMissionItem.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/MissionManager/TakeoffMissionItem.cc b/src/MissionManager/TakeoffMissionItem.cc index 64dadaa..8d5d981 100644 --- a/src/MissionManager/TakeoffMissionItem.cc +++ b/src/MissionManager/TakeoffMissionItem.cc @@ -39,6 +39,7 @@ TakeoffMissionItem::TakeoffMissionItem(const MissionItem& missionItem, Vehicle* , _settingsItem (settingsItem) { _init(); + _wizardMode = false; } TakeoffMissionItem::~TakeoffMissionItem() @@ -139,6 +140,7 @@ bool TakeoffMissionItem::load(QTextStream &loadStream) if (success) { _initLaunchTakeoffAtSameLocation(); } + _wizardMode = false; // Always be off for loaded items return success; } @@ -148,7 +150,7 @@ bool TakeoffMissionItem::load(const QJsonObject& json, int sequenceNumber, QStri if (success) { _initLaunchTakeoffAtSameLocation(); } - _wizardMode = false; // Should always be off for loaded items + _wizardMode = false; // Always be off for loaded items return success; }