Fix vive crash on deactivate

This commit is contained in:
Brad Davis 2016-03-12 21:48:36 -08:00
parent 8420e67b54
commit 27033e5bb5

View file

@ -86,13 +86,16 @@ void OpenVrDisplayPlugin::activate() {
} }
void OpenVrDisplayPlugin::deactivate() { void OpenVrDisplayPlugin::deactivate() {
// Base class deactivate must come before our local deactivate
// because the OpenGL base class handles the wait for the present
// thread before continuing
HmdDisplayPlugin::deactivate();
_container->setIsOptionChecked(StandingHMDSensorMode, false); _container->setIsOptionChecked(StandingHMDSensorMode, false);
if (_system) { if (_system) {
releaseOpenVrSystem(); releaseOpenVrSystem();
_system = nullptr; _system = nullptr;
} }
_compositor = nullptr; _compositor = nullptr;
HmdDisplayPlugin::deactivate();
} }
void OpenVrDisplayPlugin::customizeContext() { void OpenVrDisplayPlugin::customizeContext() {