Commit c226e432 authored by Gus Grubba's avatar Gus Grubba Committed by Gus Grubba

CP - Prevent testing nullified camera info request

parent b780e9d7
......@@ -110,12 +110,14 @@ QGCCameraManager::_handleHeartbeat(const mavlink_message_t &message)
if(_vehicleReadyState && _vehicle->id() == message.sysid && _vehicle->defaultComponentId() != message.compid) {
//-- First time hearing from this one?
if(!_cameraInfoRequest.contains(message.compid)) {
qCDebug(CameraManagerLog) << "Hearbeat from " << message.compid;
CameraStruct* pInfo = new CameraStruct(this);
pInfo->lastHeartbeat.start();
_cameraInfoRequest[message.compid] = pInfo;
//-- Request camera info
_requestCameraInfo(message.compid);
} else {
if(_cameraInfoRequest[message.compid]) {
//-- Check if we have indeed received the camera info
if(_cameraInfoRequest[message.compid]->infoReceived) {
//-- We have it. Just update the heartbeat timeout
......@@ -138,6 +140,7 @@ QGCCameraManager::_handleHeartbeat(const mavlink_message_t &message)
}
}
}
}
}
//-----------------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment