adding a destroy call to hmd scripting interface to ensure that it does not call isHmd mode on already dead display plugin. Also moved displayplugin reset below ui destroy calls to make sure it does not get called after its been destroyed

This commit is contained in:
amer cerkic 2019-07-11 12:15:15 -07:00
parent d5d5741d42
commit efccd10a65

View file

@ -2772,7 +2772,8 @@ void Application::cleanupBeforeQuit() {
DependencyManager::get<AccountManager>()->removeAccountFromFile();
}
_displayPlugin.reset();
DependencyManager::destroy<HMDScriptingInterface>();
PluginManager::getInstance()->shutdown();
// Cleanup all overlays after the scripts, as scripts might add more
@ -2810,6 +2811,8 @@ void Application::cleanupBeforeQuit() {
DependencyManager::destroy<OffscreenQmlSurfaceCache>();
_displayPlugin.reset();
_snapshotSoundInjector = nullptr;
// destroy Audio so it and its threads have a chance to go down safely