From 57243b55c6d4f4bad5ec10ee15f06e3545fa7438 Mon Sep 17 00:00:00 2001
From: DonLakeFlyer <don@thegagnes.com>
Date: Tue, 22 Aug 2017 11:41:21 -0700
Subject: [PATCH 1/3] Add mission property

---
 src/QmlControls/AppMessages.qml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/QmlControls/AppMessages.qml b/src/QmlControls/AppMessages.qml
index 45816d7..ca82d67 100644
--- a/src/QmlControls/AppMessages.qml
+++ b/src/QmlControls/AppMessages.qml
@@ -24,6 +24,8 @@ QGCView {
 
     property bool loaded: false
 
+    property var _qgcView: qgcView
+
     QGCPalette { id: qgcPal; colorGroupEnabled: panel.enabled }
 
     Component {
@@ -117,6 +119,7 @@ QGCView {
                 nameFilters:    [qsTr("Log files (*.txt)"), qsTr("All Files (*)")]
                 selectExisting: false
                 title:          qsTr("Select log save file")
+                qgcView:        _qgcView
                 onAcceptedForSave: {
                     debugMessageModel.writeMessages(file);
                     visible = false;

From c8416a227d5a22cd4d5511c26a599d7541ad3db7 Mon Sep 17 00:00:00 2001
From: Don Gagne <Don@don-laptop.local>
Date: Tue, 22 Aug 2017 21:03:31 -0700
Subject: [PATCH 2/3] Resume Mission: Fix up sequence numbers and current item

---
 src/MissionManager/MissionManager.cc | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/MissionManager/MissionManager.cc b/src/MissionManager/MissionManager.cc
index f027f2d..ae18e8f 100644
--- a/src/MissionManager/MissionManager.cc
+++ b/src/MissionManager/MissionManager.cc
@@ -1006,7 +1006,6 @@ void MissionManager::generateResumeMission(int resumeIndex)
     }
     resumeIndex = qMax(0, resumeIndex);
 
-    int seqNum = 0;
     QList<MissionItem*> resumeMission;
 
     QList<MAV_CMD> includedResumeCommands;
@@ -1029,7 +1028,6 @@ void MissionManager::generateResumeMission(int resumeIndex)
                            << MAV_CMD_NAV_TAKEOFF;
 
     bool addHomePosition = _vehicle->firmwarePlugin()->sendHomePositionToVehicle();
-    int setCurrentIndex = addHomePosition ? 1 : 0;
 
     int prefixCommandCount = 0;
     for (int i=0; i<_missionItems.count(); i++) {
@@ -1039,8 +1037,7 @@ void MissionManager::generateResumeMission(int resumeIndex)
                 prefixCommandCount++;
             }
             MissionItem* newItem = new MissionItem(*oldItem, this);
-            newItem->setIsCurrentItem( i == setCurrentIndex);
-            newItem->setSequenceNumber(seqNum++);
+            newItem->setIsCurrentItem(false);
             resumeMission.append(newItem);
         }
     }
@@ -1096,6 +1093,14 @@ void MissionManager::generateResumeMission(int resumeIndex)
         prefixCommandCount--;
     }
 
+    // Adjust sequence numbers and current item
+    int seqNum = 0;
+    for (int i=0; i<resumeMission.count(); i++) {
+        resumeMission[i]->setSequenceNumber(seqNum++);
+    }
+    int setCurrentIndex = addHomePosition ? 1 : 0;
+    resumeMission[setCurrentIndex]->setIsCurrentItem(true);
+
     // Send to vehicle
     _clearAndDeleteWriteMissionItems();
     for (int i=0; i<resumeMission.count(); i++) {

From c1b7e860c967c6804b1685cc8ef098b475ade926 Mon Sep 17 00:00:00 2001
From: Don Gagne <Don@don-laptop.local>
Date: Tue, 22 Aug 2017 21:19:33 -0700
Subject: [PATCH 3/3] Fix de-dup

---
 src/MissionManager/MissionManager.cc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/MissionManager/MissionManager.cc b/src/MissionManager/MissionManager.cc
index ae18e8f..2fa4cd4 100644
--- a/src/MissionManager/MissionManager.cc
+++ b/src/MissionManager/MissionManager.cc
@@ -1076,12 +1076,13 @@ void MissionManager::generateResumeMission(int resumeIndex)
             foundCameraStartStop = true;
             break;
         case MAV_CMD_IMAGE_START_CAPTURE:
-            // Only keep the first of these commands that are found
-            if (foundCameraStartStop) {
+            if (resumeItem->param3() != 0) {
+                // Remove commands which do not trigger by time
                 resumeMission.removeAt(prefixCommandCount);
+                break;
             }
-            if (resumeItem->param3() != 0) {
-                // Remove commands which do no trigger by time
+            if (foundCameraStartStop) {
+                // Only keep the first of these commands that are found
                 resumeMission.removeAt(prefixCommandCount);
             }
             foundCameraStartStop = true;