Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 16:14:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #11070 from kencooke/master

Browse source 
Merge pull request #10987 from SamGondelman/hmd59Crash2
This commit is contained in:
Brad Hefta-Gaub 2017-07-28 08:27:28 -07:00 committed by GitHub
commit 3e1174a4ca
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
plugins/oculus/src/OculusBaseDisplayPlugin.cpp
View file

@ -126,15 +126,17 @@ void OculusBaseDisplayPlugin::internalDeactivate() {
} }
bool OculusBaseDisplayPlugin::activateStandBySession() { bool OculusBaseDisplayPlugin::activateStandBySession() {
_session = acquireOculusSession();
if (!_session) { if (!_session) {
return false; _session = acquireOculusSession();
} }
return true; return _session;
} }
void OculusBaseDisplayPlugin::deactivateSession() { void OculusBaseDisplayPlugin::deactivateSession() {
releaseOculusSession(); // FIXME
_session = nullptr; // 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() { void OculusBaseDisplayPlugin::updatePresentPose() {
//mat4 sensorResetMat; //mat4 sensorResetMat;