From efccd10a65a9a4ae013a491b8ef31e0024a7314f Mon Sep 17 00:00:00 2001
From: amer cerkic <amer@highfidelity.io>
Date: Thu, 11 Jul 2019 12:15:15 -0700
Subject: [PATCH] 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

---
 interface/src/Application.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 3085f1ed2a..3310454b8c 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -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