Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 15:09:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup qml before audio

Browse source
This commit is contained in:
Zach Pomerantz 2016-10-25 15:53:35 -07:00
parent 164955dc81
commit 5413d97089
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
interface/src/Application.cpp
View file

@ -1556,17 +1556,6 @@ void Application::cleanupBeforeQuit() {
saveSettings(); saveSettings();
_window->saveGeometry(); _window->saveGeometry();
// stop the AudioClient
QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(),
"stop", Qt::BlockingQueuedConnection);
// destroy the AudioClient so it and its thread have a chance to go down safely
DependencyManager::destroy<AudioClient>();
// destroy the AudioInjectorManager so it and its thread have a chance to go down safely
// this will also stop any ongoing network injectors
DependencyManager::destroy<AudioInjectorManager>();
// Destroy third party processes after scripts have finished using them. // Destroy third party processes after scripts have finished using them.
#ifdef HAVE_DDE #ifdef HAVE_DDE
DependencyManager::destroy<DdeFaceTracker>(); DependencyManager::destroy<DdeFaceTracker>();
@ -1575,7 +1564,18 @@ void Application::cleanupBeforeQuit() {
DependencyManager::destroy<EyeTracker>(); DependencyManager::destroy<EyeTracker>();
#endif #endif
// stop QML
DependencyManager::destroy<OffscreenUi>(); DependencyManager::destroy<OffscreenUi>();
// stop audio after QML, as the qtwebengine may use it, and may crash if it is already stopped
// stop the AudioClient, synchronously
QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(),
"stop", Qt::BlockingQueuedConnection);
// destroy Audio so it and its threads have a chance to go down safely
DependencyManager::destroy<AudioClient>();
DependencyManager::destroy<AudioInjectorManager>();
} }
Application::~Application() { Application::~Application() {
@ -1596,7 +1596,6 @@ Application::~Application() {
DependencyManager::get<AvatarManager>()->getObjectsToRemoveFromPhysics(motionStates); DependencyManager::get<AvatarManager>()->getObjectsToRemoveFromPhysics(motionStates);
_physicsEngine->removeObjects(motionStates); _physicsEngine->removeObjects(motionStates);
DependencyManager::destroy<OffscreenUi>();
DependencyManager::destroy<AvatarManager>(); DependencyManager::destroy<AvatarManager>();
DependencyManager::destroy<AnimationCache>(); DependencyManager::destroy<AnimationCache>();
DependencyManager::destroy<FramebufferCache>(); DependencyManager::destroy<FramebufferCache>();