From 27322f1ba3a74172c190ddaaa23c0c668d29eb17 Mon Sep 17 00:00:00 2001
From: DonLakeFlyer <don@thegagnes.com>
Date: Sat, 13 May 2017 09:09:39 -0700
Subject: [PATCH] Fix PlanMasterController:sendPlanToVehicle

---
 src/MissionManager/PlanMasterController.cc | 12 +++++++-----
 src/Vehicle/Vehicle.cc                     |  1 +
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/MissionManager/PlanMasterController.cc b/src/MissionManager/PlanMasterController.cc
index b56ac71..7a96c4b 100644
--- a/src/MissionManager/PlanMasterController.cc
+++ b/src/MissionManager/PlanMasterController.cc
@@ -74,6 +74,9 @@ void PlanMasterController::start(bool editMode)
 void PlanMasterController::startStaticActiveVehicle(Vehicle* vehicle)
 {
     _editMode = false;
+    _missionController.start(false);
+    _geoFenceController.start(false);
+    _rallyPointController.start(false);
     _activeVehicleChanged(vehicle);
 }
 
@@ -186,7 +189,7 @@ void PlanMasterController::_loadRallyPointsComplete(void)
 
 void PlanMasterController::_sendMissionComplete(void)
 {
-    if (_editMode && _sendGeoFence) {
+    if (_sendGeoFence) {
         qCDebug(PlanMasterControllerLog) << "PlanMasterController::sendToVehicle start fence sendToVehicle";
         _sendGeoFence = false;
         _sendRallyPoints = true;
@@ -197,7 +200,7 @@ void PlanMasterController::_sendMissionComplete(void)
 
 void PlanMasterController::_sendGeoFenceComplete(void)
 {
-    if (_editMode && _sendRallyPoints) {
+    if (_sendRallyPoints) {
         qCDebug(PlanMasterControllerLog) << "PlanMasterController::sendToVehicle start rally sendToVehicle";
         _sendRallyPoints = false;
         _rallyPointController.sendToVehicle();
@@ -206,7 +209,7 @@ void PlanMasterController::_sendGeoFenceComplete(void)
 
 void PlanMasterController::_sendRallyPointsComplete(void)
 {
-    if (_editMode && _syncInProgress) {
+    if (_syncInProgress) {
         qCDebug(PlanMasterControllerLog) << "PlanMasterController::sendToVehicle rally point send complete";
         _syncInProgress = false;
         emit syncInProgressChanged(false);
@@ -217,8 +220,6 @@ void PlanMasterController::sendToVehicle(void)
 {
     if (offline()) {
         qCWarning(PlanMasterControllerLog) << "PlanMasterController::sendToVehicle called while offline";
-    } else if (!_editMode) {
-        qCWarning(PlanMasterControllerLog) << "PlanMasterController::sendToVehicle called from Fly view";
     } else if (syncInProgress()) {
         qCWarning(PlanMasterControllerLog) << "PlanMasterController::sendToVehicle called while syncInProgress";
     } else {
@@ -396,6 +397,7 @@ void PlanMasterController::sendPlanToVehicle(Vehicle* vehicle, const QString& fi
     PlanMasterController* controller = new PlanMasterController();
     controller->startStaticActiveVehicle(vehicle);
     controller->loadFromFile(filename);
+    controller->sendToVehicle();
     delete controller;
 }
 
diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc
index d961c08..d39622c 100644
--- a/src/Vehicle/Vehicle.cc
+++ b/src/Vehicle/Vehicle.cc
@@ -1754,6 +1754,7 @@ void Vehicle::_startPlanRequest(void)
                 QDir missionAutoLoadDir(missionAutoLoadDirPath);
                 QString autoloadFilename = missionAutoLoadDir.absoluteFilePath(tr("AutoLoad%1.%2").arg(_id).arg(AppSettings::planFileExtension));
                 if (QFile(autoloadFilename).exists()) {
+                    _initialPlanRequestComplete = true; // We aren't going to load from the vehicle, so we are done
                     PlanMasterController::sendPlanToVehicle(this, autoloadFilename);
                     return;
                 }