From 9d57f5ac6295a6b7b8d69a7322d4713f4fdd8747 Mon Sep 17 00:00:00 2001
From: Ken Cooke <ken@highfidelity.io>
Date: Fri, 7 Jun 2019 18:35:39 -0700
Subject: [PATCH] Defer DependencyManager::destroy<AudioInjectorManager>()
 until all ScriptAudioInjectors have been destroyed

---
 interface/src/Application.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 4a0bce5103..106ecfc606 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2759,7 +2759,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,
@@ -2819,6 +2818,7 @@ Application::~Application() {
 
     DependencyManager::destroy<SoundCacheScriptingInterface>();
 
+    DependencyManager::destroy<AudioInjectorManager>();
     DependencyManager::destroy<AvatarManager>();
     DependencyManager::destroy<AnimationCacheScriptingInterface>();
     DependencyManager::destroy<AnimationCache>();