Skip to content

Q
qgroundcontrol
Commit 0cc10d6b authored by Andrew Voznytsa's avatar Andrew Voznytsa
Browse files
Options

Make VideoManager non-crashing if thermal video receiver was not created

parent 269af52d
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
src/VideoManager/VideoManager.cc
View file @ 0cc10d6b
...@@ -117,8 +117,10 @@ VideoManager::setToolbox(QGCToolbox *toolbox) ...@@ -117,8 +117,10 @@ VideoManager::setToolbox(QGCToolbox *toolbox)
// FIXME: AV: I believe _thermalVideoReceiver should be handled just like _videoReceiver in terms of event // FIXME: AV: I believe _thermalVideoReceiver should be handled just like _videoReceiver in terms of event
// 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
connect(_thermalVideoReceiver, &VideoReceiver::timeout, this, &VideoManager::_restartVideo); if (_thermalVideoReceiver != nullptr) {
connect(_thermalVideoReceiver, &VideoReceiver::streamingChanged, this, &VideoManager::_streamingChanged); connect(_thermalVideoReceiver, &VideoReceiver::timeout, this, &VideoManager::_restartVideo);
connect(_thermalVideoReceiver, &VideoReceiver::streamingChanged, this, &VideoManager::_streamingChanged);
}
#endif #endif
_updateSettings(); _updateSettings();
if(isGStreamer()) { if(isGStreamer()) {
......
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