From 6f1cc0e2366e9574909cec6d7da11f05c149454b Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Thu, 27 Dec 2018 00:18:38 -0500 Subject: [PATCH] Don't mess with video streaming during Unittest --- src/VideoStreaming/VideoReceiver.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/VideoStreaming/VideoReceiver.cc b/src/VideoStreaming/VideoReceiver.cc index e67bbbfcc..148e07113 100644 --- a/src/VideoStreaming/VideoReceiver.cc +++ b/src/VideoStreaming/VideoReceiver.cc @@ -220,6 +220,9 @@ VideoReceiver::_timeout() void VideoReceiver::start() { + if(!qgcApp()->runningUnitTests()) { + return; + } if(!_videoSettings->streamEnabled()->rawValue().toBool() || !_videoSettings->streamConfigured()) { qCDebug(VideoReceiverLog) << "start() but not enabled/configured"; @@ -465,6 +468,9 @@ VideoReceiver::start() void VideoReceiver::stop() { + if(!qgcApp()->runningUnitTests()) { + return; + } #if defined(QGC_GST_STREAMING) _stop = true; qCDebug(VideoReceiverLog) << "stop()"; -- 2.22.0