From c3eb4b5ecd12ebbec9fcf24058087df14055e30b Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Tue, 16 Jan 2018 10:25:03 -0800
Subject: [PATCH] destroy pointermanager before pickmanager

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

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 449b014c13..6f9a9f1128 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2093,6 +2093,11 @@ void Application::cleanupBeforeQuit() {
     DependencyManager::destroy<AudioInjectorManager>();
     DependencyManager::destroy<AudioScriptingInterface>();
 
+    // The PointerManager must be destroyed before the PickManager because when a Pointer is deleted,
+    // it accesses the PickManager to delete its associated Pick
+    DependencyManager::destroy<PointerManager>();
+    DependencyManager::destroy<PickManager>();
+
     qCDebug(interfaceapp) << "Application::cleanupBeforeQuit() complete";
 }