From 6eb0e425392745e26de8796265cb04fffb6ab5a2 Mon Sep 17 00:00:00 2001
From: Julian Oes <julian@oes.ch>
Date: Mon, 3 Jun 2024 11:30:23 +1200
Subject: [PATCH] Camera: video stream request fixup

This fixes getting the video stream.
---
 src/Camera/QGCCameraControl.cc | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Camera/QGCCameraControl.cc b/src/Camera/QGCCameraControl.cc
index aa308d0..3d0c920 100644
--- a/src/Camera/QGCCameraControl.cc
+++ b/src/Camera/QGCCameraControl.cc
@@ -1796,7 +1796,7 @@ QGCCameraControl::_requestStreamInfo(uint8_t streamID)
     qCDebug(CameraControlLog) << "Requesting video stream info for:" << streamID;
     // By default, try to use new REQUEST_MESSAGE command instead of 
     // deprecated MAV_CMD_REQUEST_VIDEO_STREAM_INFORMATION.
-    if (_videoStreamStatusRetries % 2 == 0) {
+    if (_videoStreamStatusRetries++ % 2 == 0) {
         _vehicle->sendMavCommand(
             _compID,                                         // target component
             MAV_CMD_REQUEST_MESSAGE,                        // command id
@@ -1827,11 +1827,11 @@ QGCCameraControl::_requestStreamStatus(uint8_t streamID)
             MAVLINK_MSG_ID_VIDEO_STREAM_STATUS,             // msgid
             streamID);                                      // stream id
     } else {
-    _vehicle->sendMavCommand(
-        _compID,                                            // Target component
-        MAV_CMD_REQUEST_VIDEO_STREAM_STATUS,                // Command id
-        false,                                              // ShowError
-        streamID);                                          // Stream ID
+        _vehicle->sendMavCommand(
+            _compID,                                            // Target component
+            MAV_CMD_REQUEST_VIDEO_STREAM_STATUS,                // Command id
+            false,                                              // ShowError
+            streamID);                                          // Stream ID
     }
     _streamStatusTimer.start(1000);                         // Wait up to a second for it
 }
@@ -1904,7 +1904,6 @@ QGCCameraControl::_streamInfoTimeout()
 void
 QGCCameraControl::_streamStatusTimeout()
 {
-    _videoStreamStatusRetries++;
     QGCVideoStreamInfo* pStream = currentStreamInstance();
     if(pStream) {
         _requestStreamStatus(static_cast<uint8_t>(pStream->streamID()));