Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 17:35:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix OpenVR shutdown crash

Browse source
This commit is contained in:
Bradley Austin Davis 2016-03-17 14:37:43 -07:00
parent 1cf89f046c
commit d6d7e67ca3
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
interface/src/Application.cpp
View file

@ -1060,6 +1060,14 @@ void Application::showCursor(const QCursor& cursor) {
void Application::aboutToQuit() { void Application::aboutToQuit() {
emit beforeAboutToQuit(); emit beforeAboutToQuit();
foreach(auto inputPlugin, PluginManager::getInstance()->getInputPlugins()) {
QString name = inputPlugin->getName();
QAction* action = Menu::getInstance()->getActionForOption(name);
if (action->isChecked()) {
inputPlugin->deactivate();
}
}
getActiveDisplayPlugin()->deactivate(); getActiveDisplayPlugin()->deactivate();
_aboutToQuit = true; _aboutToQuit = true;
@ -1149,14 +1157,6 @@ Application::~Application() {
ModelEntityItem::cleanupLoadedAnimations(); ModelEntityItem::cleanupLoadedAnimations();
foreach(auto inputPlugin, PluginManager::getInstance()->getInputPlugins()) {
QString name = inputPlugin->getName();
QAction* action = Menu::getInstance()->getActionForOption(name);
if (action->isChecked()) {
inputPlugin->deactivate();
}
}
// remove avatars from physics engine // remove avatars from physics engine
DependencyManager::get<AvatarManager>()->clearOtherAvatars(); DependencyManager::get<AvatarManager>()->clearOtherAvatars();
VectorOfMotionStates motionStates; VectorOfMotionStates motionStates;