From 4684b388c79a2a36d0a2556817fa71f9df25483a Mon Sep 17 00:00:00 2001
From: Chris Collins <chris@highfidelity.io>
Date: Thu, 27 Jul 2017 11:31:22 -0700
Subject: [PATCH] Merge pull request #10987 from SamGondelman/hmd59Crash2

Fix crash when putting on HMD for Qt 5.9
---
 plugins/oculus/src/OculusBaseDisplayPlugin.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/plugins/oculus/src/OculusBaseDisplayPlugin.cpp b/plugins/oculus/src/OculusBaseDisplayPlugin.cpp
index 93f4787f0f..0df504dfa2 100644
--- a/plugins/oculus/src/OculusBaseDisplayPlugin.cpp
+++ b/plugins/oculus/src/OculusBaseDisplayPlugin.cpp
@@ -126,15 +126,17 @@ void OculusBaseDisplayPlugin::internalDeactivate() {
 }
 
 bool OculusBaseDisplayPlugin::activateStandBySession() {
-    _session = acquireOculusSession();
     if (!_session) {
-        return false;
+        _session = acquireOculusSession();
     }
-    return true;
+    return _session;
 }
 void OculusBaseDisplayPlugin::deactivateSession() {
-    releaseOculusSession();
-    _session = nullptr;
+    // FIXME
+    // Switching to Qt 5.9 exposed a race condition or similar issue that caused a crash when putting on an Rift
+    // while already in VR mode.  Commenting these out is a workaround.
+    //releaseOculusSession();
+    //_session = nullptr;
 }
 void OculusBaseDisplayPlugin::updatePresentPose() {
     //mat4 sensorResetMat;