Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
7df16b80
Unverified
Commit
7df16b80
authored
Dec 05, 2019
by
Gus Grubba
Committed by
GitHub
Dec 05, 2019
Browse files
Merge pull request #8067 from andrewvoznytsa/gst_deadlock
Fix gstreamer's deadlock on QGC exit
parents
86a7a513
181d16f6
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/ui/MainRootWindow.qml
View file @
7df16b80
...
@@ -192,6 +192,7 @@ ApplicationWindow {
...
@@ -192,6 +192,7 @@ ApplicationWindow {
function
finishCloseProcess
()
{
function
finishCloseProcess
()
{
QGroundControl
.
linkManager
.
shutdown
()
QGroundControl
.
linkManager
.
shutdown
()
QGroundControl
.
videoManager
.
stopVideo
();
_forceClose
=
true
_forceClose
=
true
mainWindow
.
close
()
mainWindow
.
close
()
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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