Merge pull request #714 from Dronecode/fix-mission-double-call

mission: fix double call of result callback
mavlink · Apr 2, 2019 · dc0f4cf · dc0f4cf
2 parents 15b34bc + f70b6dd
commit dc0f4cf
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/plugins/mission/mission_impl.cpp b/plugins/mission/mission_impl.cpp
@@ -140,6 +140,11 @@ void MissionImpl::process_mission_ack(const mavlink_message_t &message)
     {
         std::lock_guard<std::recursive_mutex> lock(_mission_data.mutex);
         temp_callback = _mission_data.result_callback;
+        // For the odd case where mission_ack is processed twice in quick succession
+        // we need to make sure we only copy the callback once and only get nullptr
+        // for the subsequent case. Otherwise we might report a result twice and
+        // upset a caller.
+        _mission_data.result_callback = nullptr;
     }
 
     {