From 0cc10d6bbbafa885a6d8b83763217645bf03c9ff Mon Sep 17 00:00:00 2001 From: Andrew Voznytsa Date: Thu, 26 Mar 2020 18:51:15 +0200 Subject: [PATCH] Make VideoManager non-crashing if thermal video receiver was not created --- src/VideoManager/VideoManager.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/VideoManager/VideoManager.cc b/src/VideoManager/VideoManager.cc index 2fdf8a326..a49744224 100644 --- a/src/VideoManager/VideoManager.cc +++ b/src/VideoManager/VideoManager.cc @@ -117,8 +117,10 @@ VideoManager::setToolbox(QGCToolbox *toolbox) // 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 - connect(_thermalVideoReceiver, &VideoReceiver::timeout, this, &VideoManager::_restartVideo); - connect(_thermalVideoReceiver, &VideoReceiver::streamingChanged, this, &VideoManager::_streamingChanged); + if (_thermalVideoReceiver != nullptr) { + connect(_thermalVideoReceiver, &VideoReceiver::timeout, this, &VideoManager::_restartVideo); + connect(_thermalVideoReceiver, &VideoReceiver::streamingChanged, this, &VideoManager::_streamingChanged); + } #endif _updateSettings(); if(isGStreamer()) { -- 2.22.0