Merge pull request #5701 from DonLakeFlyer/CurrentMissionItem

Fix current mission item updates

src/MissionManager/MissionManager.cc

@@ -40,8 +40,6 @@ void MissionManager::writeArduPilotGuidedMissionItem(const QGeoCoordinate& gotoC
 
     _transactionInProgress = TransactionWrite;
 
-    _connectToMavlink();
-
     mavlink_message_t       messageOut;
     mavlink_mission_item_t  missionItem;
 

src/MissionManager/PlanManager.cc

@@ -38,6 +38,7 @@ PlanManager::PlanManager(Vehicle* vehicle, MAV_MISSION_TYPE planType)
     _ackTimeoutTimer->setInterval(_ackTimeoutMilliseconds);
     
     connect(_ackTimeoutTimer, &QTimer::timeout, this, &PlanManager::_ackTimeout);
+    connect(_vehicle, &Vehicle::mavlinkMessageReceived, this, &PlanManager::_mavlinkMessageReceived);
 }
 
 PlanManager::~PlanManager()
@@ -62,7 +63,6 @@ void PlanManager::_writeMissionItemsWorker(void)
     _transactionInProgress = TransactionWrite;
     _retryCount = 0;
     emit inProgressChanged(true);
-    _connectToMavlink();
     _writeMissionCount();
 }
 
@@ -139,7 +139,6 @@ void PlanManager::loadFromVehicle(void)
     _retryCount = 0;
     _transactionInProgress = TransactionRead;
     emit inProgressChanged(true);
-    _connectToMavlink();
     _requestList();
 }
 
@@ -803,7 +802,6 @@ QString PlanManager::_missionResultToString(MAV_MISSION_RESULT result)
 void PlanManager::_finishTransaction(bool success)
 {
     emit progressPct(1);
-    _disconnectFromMavlink();
 
     _itemIndicesToRead.clear();
     _itemIndicesToWrite.clear();
@@ -892,7 +890,6 @@ void PlanManager::_removeAllWorker(void)
 
     emit progressPct(0);
 
-    _connectToMavlink();
     _dedicatedLink = _vehicle->priorityLink();
     mavlink_msg_mission_clear_all_pack_chan(qgcApp()->toolbox()->mavlinkProtocol()->getSystemId(),
                                             qgcApp()->toolbox()->mavlinkProtocol()->getComponentId(),
@@ -944,16 +941,6 @@ void PlanManager::_clearAndDeleteWriteMissionItems(void)
     _writeMissionItems.clear();
 }
 
-void PlanManager::_connectToMavlink(void)
-{
-    connect(_vehicle, &Vehicle::mavlinkMessageReceived, this, &PlanManager::_mavlinkMessageReceived);
-}
-
-void PlanManager::_disconnectFromMavlink(void)
-{
-    disconnect(_vehicle, &Vehicle::mavlinkMessageReceived, this, &PlanManager::_mavlinkMessageReceived);
-}
-
 QString PlanManager::_planTypeString(void)
 {
     switch (_planType) {

src/MissionManager/PlanManager.h

@@ -126,8 +126,6 @@ protected:
     void _clearAndDeleteWriteMissionItems(void);
     QString _lastMissionReqestString(MAV_MISSION_RESULT result);
     void _removeAllWorker(void);
-    void _connectToMavlink(void);
-    void _disconnectFromMavlink(void);
     QString _planTypeString(void);
 
 protected: