Commit ff1eb2d3 authored by Andrew Voznytsa's avatar Andrew Voznytsa

Fix timeout handling

parent ce1aae53
...@@ -116,7 +116,7 @@ VideoManager::setToolbox(QGCToolbox *toolbox) ...@@ -116,7 +116,7 @@ VideoManager::setToolbox(QGCToolbox *toolbox)
_videoReceiver[1] = toolbox->corePlugin()->createVideoReceiver(this); _videoReceiver[1] = toolbox->corePlugin()->createVideoReceiver(this);
connect(_videoReceiver[0], &VideoReceiver::timeout, this, [this](){ connect(_videoReceiver[0], &VideoReceiver::timeout, this, [this](){
_restartVideo(0); _stopReceiver(0);
}); });
connect(_videoReceiver[0], &VideoReceiver::streamingChanged, this, [this](bool active){ connect(_videoReceiver[0], &VideoReceiver::streamingChanged, this, [this](bool active){
...@@ -179,7 +179,7 @@ VideoManager::setToolbox(QGCToolbox *toolbox) ...@@ -179,7 +179,7 @@ VideoManager::setToolbox(QGCToolbox *toolbox)
// and I expect that it will be changed during multiple video stream activity // and I expect that it will be changed during multiple video stream activity
if (_videoReceiver[1] != nullptr) { if (_videoReceiver[1] != nullptr) {
connect(_videoReceiver[1], &VideoReceiver::timeout, this, [this](){ connect(_videoReceiver[1], &VideoReceiver::timeout, this, [this](){
_restartVideo(1); _stopReceiver(1);
}); });
connect(_videoReceiver[1], &VideoReceiver::streamingChanged, this, [this](bool active){ connect(_videoReceiver[1], &VideoReceiver::streamingChanged, this, [this](bool active){
......
...@@ -356,9 +356,6 @@ GstVideoReceiver::stop(void) ...@@ -356,9 +356,6 @@ GstVideoReceiver::stop(void)
}); });
} else { } else {
qCDebug(VideoReceiverLog) << "Streaming did not start" << _uri; qCDebug(VideoReceiverLog) << "Streaming did not start" << _uri;
_dispatchSignal([this](){
emit timeout();
});
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment