From 63f0271b37e06f4448a8bcf0a9706b86ab10d3e3 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Mon, 3 Oct 2016 12:17:10 -0700 Subject: [PATCH] Fix for unit testing --- src/uas/FileManager.cc | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/uas/FileManager.cc b/src/uas/FileManager.cc index 759c12fb8..2a16a6308 100644 --- a/src/uas/FileManager.cc +++ b/src/uas/FileManager.cc @@ -731,16 +731,23 @@ void FileManager::_sendRequest(Request* request) if (_systemIdQGC == 0) { _systemIdQGC = qgcApp()->toolbox()->mavlinkProtocol()->getSystemId(); } + + // Unit testing code can end up here without _dedicateLink set since it tests inidividual commands. + LinkInterface* link; + if (_dedicatedLink) { + link = _dedicatedLink; + } else { + link = _vehicle->priorityLink(); + } - Q_ASSERT(_vehicle); mavlink_msg_file_transfer_protocol_pack_chan(_systemIdQGC, // QGC System ID 0, // QGC Component ID - _dedicatedLink->mavlinkChannel(), + link->mavlinkChannel(), &message, // Mavlink Message to pack into 0, // Target network _systemIdServer, // Target system 0, // Target component (uint8_t*)request); // Payload - _vehicle->sendMessageOnLink(_dedicatedLink, message); + _vehicle->sendMessageOnLink(link, message); } -- 2.22.0