Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-11 18:12:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Prevent crashes in openvr on shutdown

Browse source 
By ensuring that there is an opengl context is bound before calling VR_Shutdown()
This commit is contained in:
Anthony J. Thibault 2016-10-11 16:36:29 -07:00
parent abb05bc686
commit 973ee544fb
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugins/openvr/src/OpenVrDisplayPlugin.cpp
View file

@ -445,8 +445,9 @@ void OpenVrDisplayPlugin::internalDeactivate() {
_openVrDisplayActive = false;
_container->setIsOptionChecked(StandingHMDSensorMode, false);
if (_system) {
// Invalidate poses. It's fine if someone else sets these shared values, but we're about to stop updating them, and
// TODO: Invalidate poses. It's fine if someone else sets these shared values, but we're about to stop updating them, and
// we don't want ViveControllerManager to consider old values to be valid.
_container->makeRenderingContextCurrent();
releaseOpenVrSystem();
_system = nullptr;
}

1
plugins/openvr/src/ViveControllerManager.cpp
View file

@ -132,6 +132,7 @@ void ViveControllerManager::deactivate() {
_container->removeMenu(MENU_PATH);
if (_system) {
_container->makeRenderingContextCurrent();
releaseOpenVrSystem();
_system = nullptr;
}