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
6179a340
Unverified
Commit
6179a340
authored
Sep 03, 2019
by
Don Gagne
Committed by
GitHub
Sep 03, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7755 from DonLakeFlyer/QmlShutdown
Correct Qml engine shutdown
parents
e17deefa
b4d71d40
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
77 additions
and
83 deletions
+77
-83
QGCApplication.cc
src/QGCApplication.cc
+3
-0
GeneralSettings.qml
src/ui/preferences/GeneralSettings.qml
+74
-83
No files found.
src/QGCApplication.cc
View file @
6179a340
...
...
@@ -448,6 +448,9 @@ void QGCApplication::setLanguage()
void
QGCApplication
::
_shutdown
()
{
// Close out all Qml before we delete toolbox. This way we don't get all sorts of null reference complaints from Qml.
delete
_qmlAppEngine
;
shutdownVideoStreaming
();
delete
_toolbox
;
}
...
...
src/ui/preferences/GeneralSettings.qml
View file @
6179a340
This diff is collapsed.
Click to expand it.
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