Merge pull request #15715 from kencooke/audio-injecctor-shutdown-crashfix

BUGZ-399: Fix shutdown crash in AudioInjectorManager::stop()
This commit is contained in:
Shannon Romano 2019-06-10 10:12:26 -07:00 committed by GitHub
commit 69094aa8f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2763,7 +2763,6 @@ void Application::cleanupBeforeQuit() {
// this must happen after QML, as there are unexplained audio crashes originating in qtwebengine
QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "stop");
DependencyManager::destroy<AudioClient>();
DependencyManager::destroy<AudioInjectorManager>();
DependencyManager::destroy<AudioScriptingInterface>();
// The PointerManager must be destroyed before the PickManager because when a Pointer is deleted,
@ -2823,6 +2822,7 @@ Application::~Application() {
DependencyManager::destroy<SoundCacheScriptingInterface>();
DependencyManager::destroy<AudioInjectorManager>();
DependencyManager::destroy<AvatarManager>();
DependencyManager::destroy<AnimationCacheScriptingInterface>();
DependencyManager::destroy<AnimationCache>();