From 7bcff05d7dd28c701e1c525c1c9d30154dd8261b Mon Sep 17 00:00:00 2001 From: David Jablonski Date: Mon, 14 Feb 2022 07:54:54 +0100 Subject: [PATCH] camera control: do not save ftp downloaded xml file twice --- src/Camera/QGCCameraControl.cc | 1 + src/Camera/QGCCameraManager.cc | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Camera/QGCCameraControl.cc b/src/Camera/QGCCameraControl.cc index 9d964be..d9d6985 100644 --- a/src/Camera/QGCCameraControl.cc +++ b/src/Camera/QGCCameraControl.cc @@ -2056,6 +2056,7 @@ void QGCCameraControl::_ftpDownloadComplete(const QString& fileName, const QStri return; } + _cached = true; QByteArray bytes = xmlFile.readAll(); emit dataReady(bytes); } diff --git a/src/Camera/QGCCameraManager.cc b/src/Camera/QGCCameraManager.cc index 907bd36..1e76124 100644 --- a/src/Camera/QGCCameraManager.cc +++ b/src/Camera/QGCCameraManager.cc @@ -112,7 +112,6 @@ QGCCameraManager::_handleHeartbeat(const mavlink_message_t &message) mavlink_heartbeat_t heartbeat; mavlink_msg_heartbeat_decode(&message, &heartbeat); //-- First time hearing from this one? - qCDebug(CameraManagerLog) << "Another Hearbeat from " << message.compid; QString sCompID = QString::number(message.compid); if(!_cameraInfoRequest.contains(sCompID)) { qCDebug(CameraManagerLog) << "Hearbeat from " << message.compid;