Unverified Commit 6179a340 authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #7755 from DonLakeFlyer/QmlShutdown

Correct Qml engine shutdown
parents e17deefa b4d71d40
...@@ -448,6 +448,9 @@ void QGCApplication::setLanguage() ...@@ -448,6 +448,9 @@ void QGCApplication::setLanguage()
void QGCApplication::_shutdown() 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(); shutdownVideoStreaming();
delete _toolbox; delete _toolbox;
} }
......
This diff is collapsed.
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