diff --git a/src/VideoManager/VideoManager.cc b/src/VideoManager/VideoManager.cc index 8f2fe4000d57002c25e84be750fb6b07d3771de6..fc176a8c7117b321aa5a23e85b797768d29c8791 100644 --- a/src/VideoManager/VideoManager.cc +++ b/src/VideoManager/VideoManager.cc @@ -116,7 +116,7 @@ VideoManager::setToolbox(QGCToolbox *toolbox) _videoReceiver[1] = toolbox->corePlugin()->createVideoReceiver(this); connect(_videoReceiver[0], &VideoReceiver::timeout, this, [this](){ - _restartVideo(0); + _stopReceiver(0); }); connect(_videoReceiver[0], &VideoReceiver::streamingChanged, this, [this](bool active){ @@ -179,7 +179,7 @@ VideoManager::setToolbox(QGCToolbox *toolbox) // and I expect that it will be changed during multiple video stream activity if (_videoReceiver[1] != nullptr) { connect(_videoReceiver[1], &VideoReceiver::timeout, this, [this](){ - _restartVideo(1); + _stopReceiver(1); }); connect(_videoReceiver[1], &VideoReceiver::streamingChanged, this, [this](bool active){ diff --git a/src/VideoReceiver/GstVideoReceiver.cc b/src/VideoReceiver/GstVideoReceiver.cc index 2dfb78e16699e843d2eb689ccc8b59d4eae607fd..5f4fed69a094f30837c0d7483115d2a73b670caf 100644 --- a/src/VideoReceiver/GstVideoReceiver.cc +++ b/src/VideoReceiver/GstVideoReceiver.cc @@ -356,9 +356,6 @@ GstVideoReceiver::stop(void) }); } else { qCDebug(VideoReceiverLog) << "Streaming did not start" << _uri; - _dispatchSignal([this](){ - emit timeout(); - }); } }