Merge pull request #5743 from mavlink/cameraManagement

Properly handle camera info request and response.

src/Camera/QGCCameraManager.cc

@@ -78,7 +78,7 @@ QGCCameraManager::_handleHeartbeat(const mavlink_message_t &message)
     mavlink_msg_heartbeat_decode(&message, &heartbeat);
     //-- If this heartbeat is from a different node within the vehicle
     if(_vehicleReadyState && _vehicle->id() == message.sysid && _vehicle->defaultComponentId() != message.compid) {
-        if(!_cameraInfoRequested[message.compid]) {
+        if(!_cameraInfoRequested.contains(message.compid)) {
             _cameraInfoRequested[message.compid] = true;
             //-- Request camera info
             _requestCameraInfo(message.compid);
@@ -110,6 +110,10 @@ QGCCameraManager::_findCamera(int id)
 void
 QGCCameraManager::_handleCameraInfo(const mavlink_message_t& message)
 {
+    //-- Have we requested it?
+    if(_cameraInfoRequested.contains(message.compid) && _cameraInfoRequested[message.compid]) {
+        //-- Flag it as done
+        _cameraInfoRequested[message.compid] = false;
         mavlink_camera_information_t info;
         mavlink_msg_camera_information_decode(&message, &info);
         qCDebug(CameraManagerLog) << "_handleCameraInfo:" << (const char*)(void*)&info.model_name[0] << (const char*)(void*)&info.vendor_name[0] << "Comp ID:" << message.compid;
@@ -119,6 +123,7 @@ QGCCameraManager::_handleCameraInfo(const mavlink_message_t& message)
             _cameras.append(pCamera);
             emit camerasChanged();
         }
+    }
 }
 
 //-----------------------------------------------------------------------------