Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
0cc10d6b
Commit
0cc10d6b
authored
Mar 26, 2020
by
Andrew Voznytsa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make VideoManager non-crashing if thermal video receiver was not created
parent
269af52d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
VideoManager.cc
src/VideoManager/VideoManager.cc
+4
-2
No files found.
src/VideoManager/VideoManager.cc
View file @
0cc10d6b
...
...
@@ -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
())
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment