From 0aee95fe38a3d5e5ec2e1f3479139d6f18969842 Mon Sep 17 00:00:00 2001
From: Sam Gondelman <samuel_gondelman@brown.edu>
Date: Fri, 24 Jul 2015 17:44:20 -0700
Subject: [PATCH] oculus sdk initialization done in activate/deactivate, not
 init/deinit

---
 .../oculus/Oculus_0_5_DisplayPlugin.cpp          | 16 ++++++----------
 .../oculus/Oculus_0_5_DisplayPlugin.h            |  2 --
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/libraries/display-plugins/src/display-plugins/oculus/Oculus_0_5_DisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/oculus/Oculus_0_5_DisplayPlugin.cpp
index 0f76744130..12b0b8d38f 100644
--- a/libraries/display-plugins/src/display-plugins/oculus/Oculus_0_5_DisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/oculus/Oculus_0_5_DisplayPlugin.cpp
@@ -47,7 +47,7 @@ bool Oculus_0_5_DisplayPlugin::isSupported() const {
     return result;
 }
 
-void Oculus_0_5_DisplayPlugin::init() {
+void Oculus_0_5_DisplayPlugin::activate(PluginContainer * container) {
     if (!OVR_SUCCESS(ovr_Initialize(nullptr))) {
         Q_ASSERT(false);
         qFatal("Failed to Initialize SDK");
@@ -56,15 +56,7 @@ void Oculus_0_5_DisplayPlugin::init() {
     if (!_hmd) {
         qFatal("Failed to acquire HMD");
     }
-}
-
-void Oculus_0_5_DisplayPlugin::deinit() {
-    ovrHmd_Destroy(_hmd);
-    _hmd = nullptr;
-    ovr_Shutdown();
-}
-
-void Oculus_0_5_DisplayPlugin::activate(PluginContainer * container) {
+    
     OculusBaseDisplayPlugin::activate(container);
 
     _window->makeCurrent();
@@ -112,6 +104,10 @@ void Oculus_0_5_DisplayPlugin::deactivate(PluginContainer* container) {
     _hmdWindow = nullptr;
 
     OculusBaseDisplayPlugin::deactivate(container);
+    
+    ovrHmd_Destroy(_hmd);
+    _hmd = nullptr;
+    ovr_Shutdown();
 }
 
 void Oculus_0_5_DisplayPlugin::preRender() {
diff --git a/libraries/display-plugins/src/display-plugins/oculus/Oculus_0_5_DisplayPlugin.h b/libraries/display-plugins/src/display-plugins/oculus/Oculus_0_5_DisplayPlugin.h
index 594544d9ad..6b77f7617e 100644
--- a/libraries/display-plugins/src/display-plugins/oculus/Oculus_0_5_DisplayPlugin.h
+++ b/libraries/display-plugins/src/display-plugins/oculus/Oculus_0_5_DisplayPlugin.h
@@ -25,8 +25,6 @@ public:
     virtual bool isSupported() const override;
     virtual const QString & getName() const override;
 
-    virtual void init() override;
-    virtual void deinit() override;
     virtual void activate(PluginContainer * container) override;
     virtual void deactivate(PluginContainer* container) override;