Browse Source

camera control: do not save ftp downloaded xml file twice

QGC4.4
David Jablonski 3 years ago committed by Ramon Roche
parent
commit
7bcff05d7d
  1. 1
      src/Camera/QGCCameraControl.cc
  2. 1
      src/Camera/QGCCameraManager.cc

1
src/Camera/QGCCameraControl.cc

@ -2056,6 +2056,7 @@ void QGCCameraControl::_ftpDownloadComplete(const QString& fileName, const QStri
return; return;
} }
_cached = true;
QByteArray bytes = xmlFile.readAll(); QByteArray bytes = xmlFile.readAll();
emit dataReady(bytes); emit dataReady(bytes);
} }

1
src/Camera/QGCCameraManager.cc

@ -112,7 +112,6 @@ QGCCameraManager::_handleHeartbeat(const mavlink_message_t &message)
mavlink_heartbeat_t heartbeat; mavlink_heartbeat_t heartbeat;
mavlink_msg_heartbeat_decode(&message, &heartbeat); mavlink_msg_heartbeat_decode(&message, &heartbeat);
//-- First time hearing from this one? //-- First time hearing from this one?
qCDebug(CameraManagerLog) << "Another Hearbeat from " << message.compid;
QString sCompID = QString::number(message.compid); QString sCompID = QString::number(message.compid);
if(!_cameraInfoRequest.contains(sCompID)) { if(!_cameraInfoRequest.contains(sCompID)) {
qCDebug(CameraManagerLog) << "Hearbeat from " << message.compid; qCDebug(CameraManagerLog) << "Hearbeat from " << message.compid;

Loading…
Cancel
Save