From 2c7fb09373fcd104ea661685135a72e49585aeeb Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Sun, 20 Jan 2019 13:57:32 -0500 Subject: [PATCH] CP - Skip video stream auto configure if using Taisync --- src/Camera/QGCCameraControl.cc | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/Camera/QGCCameraControl.cc b/src/Camera/QGCCameraControl.cc index 39605d090..3eb7219b2 100644 --- a/src/Camera/QGCCameraControl.cc +++ b/src/Camera/QGCCameraControl.cc @@ -1928,13 +1928,16 @@ void QGCCameraControl::_checkForVideoStreams() { if(_info.flags & CAMERA_CAP_FLAGS_HAS_VIDEO_STREAM) { - connect(&_streamInfoTimer, &QTimer::timeout, this, &QGCCameraControl::_streamTimeout); - _streamInfoTimer.setSingleShot(false); - connect(&_streamStatusTimer, &QTimer::timeout, this, &QGCCameraControl::_streamStatusTimeout); - _streamStatusTimer.setSingleShot(true); - //-- Request all streams - _requestStreamInfo(0); - _streamInfoTimer.start(2000); + //-- Skip it if using Taisync as it has its own video settings + if(!qgcApp()->toolbox()->videoManager()->isTaisync()) { + connect(&_streamInfoTimer, &QTimer::timeout, this, &QGCCameraControl::_streamTimeout); + _streamInfoTimer.setSingleShot(false); + connect(&_streamStatusTimer, &QTimer::timeout, this, &QGCCameraControl::_streamStatusTimeout); + _streamStatusTimer.setSingleShot(true); + //-- Request all streams + _requestStreamInfo(0); + _streamInfoTimer.start(2000); + } } } -- 2.22.0