From 02d96ea5c6935f43960145c28ac8f3d6fa526841 Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Tue, 12 Feb 2019 11:14:33 +0100 Subject: [PATCH] mission: use correct callback for download timeout This changes the callback used in the case of a timeout while trying to download the mission items. Before we used the wrong one, so never got notified. This was not caught by the integration tests because they generally only test the happy path given we had no hooks yet for a lossy link where these things happen. --- plugins/mission/mission_impl.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/mission/mission_impl.cpp b/plugins/mission/mission_impl.cpp index ea0d467488..9a859640c6 100644 --- a/plugins/mission/mission_impl.cpp +++ b/plugins/mission/mission_impl.cpp @@ -1284,7 +1284,8 @@ 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(); { @@ -1292,7 +1293,7 @@ void MissionImpl::process_timeout() _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();