From f496175fb94b3307d31948d964bedcfd4c437a61 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Thu, 9 Apr 2015 09:17:23 -0700
Subject: [PATCH] Attempt to stop the crashing on exit caused by the Oculus SDK

---
 interface/src/devices/OculusManager.cpp | 13 +++++++++++--
 interface/src/devices/OculusManager.h   |  1 +
 interface/src/main.cpp                  |  1 +
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/interface/src/devices/OculusManager.cpp b/interface/src/devices/OculusManager.cpp
index 3f527c6137..437229a483 100644
--- a/interface/src/devices/OculusManager.cpp
+++ b/interface/src/devices/OculusManager.cpp
@@ -114,8 +114,11 @@ void OculusManager::initSdk() {
 }
 
 void OculusManager::shutdownSdk() {
-    ovrHmd_Destroy(_ovrHmd);
-    ovr_Shutdown();
+    if (_ovrHmd) {
+        ovrHmd_Destroy(_ovrHmd);
+        _ovrHmd = nullptr;
+        ovr_Shutdown();
+    }
 }
 
 void OculusManager::init() {
@@ -124,6 +127,12 @@ void OculusManager::init() {
 #endif
 }
 
+void OculusManager::deinit() {
+#ifdef OVR_DIRECT_MODE
+    shutdownSdk();
+#endif
+}
+
 void OculusManager::connect() {
 #ifndef OVR_DIRECT_MODE
 	initSdk();
diff --git a/interface/src/devices/OculusManager.h b/interface/src/devices/OculusManager.h
index fe2da31231..4b1bc98fb2 100644
--- a/interface/src/devices/OculusManager.h
+++ b/interface/src/devices/OculusManager.h
@@ -51,6 +51,7 @@ class Text3DOverlay;
 class OculusManager {
 public:
     static void init();
+    static void deinit();
     static void connect();
     static void disconnect();
     static bool isConnected();
diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index b4486ceb2b..7d80b077b8 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -112,6 +112,7 @@ int main(int argc, const char* argv[]) {
         exitCode = app.exec();
     }
 
+    OculusManager::deinit();
 #ifdef Q_OS_WIN
     ReleaseMutex(mutex);
 #endif