Merge pull request #10987 from SamGondelman/hmd59Crash2

Fix crash when putting on HMD for Qt 5.9
This commit is contained in:
Chris Collins 2017-07-27 11:31:22 -07:00 committed by Ken Cooke
parent d572510770
commit 4684b388c7

View file

@ -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;