From 27033e5bb513b9f486cf48ea6648c4ce14439355 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Sat, 12 Mar 2016 21:48:36 -0800
Subject: [PATCH] Fix vive crash on deactivate

---
 plugins/openvr/src/OpenVrDisplayPlugin.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/openvr/src/OpenVrDisplayPlugin.cpp b/plugins/openvr/src/OpenVrDisplayPlugin.cpp
index 4568d670c6..47b3e233cf 100644
--- a/plugins/openvr/src/OpenVrDisplayPlugin.cpp
+++ b/plugins/openvr/src/OpenVrDisplayPlugin.cpp
@@ -86,13 +86,16 @@ void OpenVrDisplayPlugin::activate() {
 }
 
 void OpenVrDisplayPlugin::deactivate() {
+    // Base class deactivate must come before our local deactivate
+    // because the OpenGL base class handles the wait for the present 
+    // thread before continuing
+    HmdDisplayPlugin::deactivate();
     _container->setIsOptionChecked(StandingHMDSensorMode, false);
     if (_system) {
         releaseOpenVrSystem();
         _system = nullptr;
     }
     _compositor = nullptr;
-    HmdDisplayPlugin::deactivate();
 }
 
 void OpenVrDisplayPlugin::customizeContext() {