Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 00:44:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8786 from hyperlogic/bug-fix/more-openvr-shutdown-crashes

Browse source 
Prevent crashes in openvr on shutdown
This commit is contained in:
Brad Davis 2016-10-12 13:54:56 -07:00 committed by GitHub
commit 2d6522a76f
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; _openVrDisplayActive = false;
_container->setIsOptionChecked(StandingHMDSensorMode, false); _container->setIsOptionChecked(StandingHMDSensorMode, false);
if (_system) { 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. // we don't want ViveControllerManager to consider old values to be valid.
_container->makeRenderingContextCurrent();
releaseOpenVrSystem(); releaseOpenVrSystem();
_system = nullptr; _system = nullptr;
} }

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

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