Merge 02d96ea into 1a62225

mavlink · Feb 12, 2019 · 53fca7a · 53fca7a
2 parents 1a62225 + 02d96ea
commit 53fca7a
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/plugins/mission/mission_impl.cpp b/plugins/mission/mission_impl.cpp
@@ -1284,15 +1284,16 @@ void MissionImpl::process_timeout()
         _mission_data.mutex.lock();
         if (_mission_data.retries++ > MAX_RETRIES) {
             _mission_data.retries = 0;
-            Mission::result_callback_t result_callback = _mission_data.result_callback;
+            Mission::mission_items_and_result_callback_t temp_callback =
+                _mission_data.mission_items_and_result_callback;
             _mission_data.mutex.unlock();
 
             {
                 std::lock_guard<std::mutex> lock(_activity.mutex);
                 _activity.state = Activity::State::NONE;
             }
             LogWarn() << "Mission handling timed out while downloading mission.";
-            report_mission_result(result_callback, Mission::Result::TIMEOUT);
+            report_mission_items_and_result(temp_callback, Mission::Result::TIMEOUT);
         } else {
             _mission_data.mutex.unlock();