Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-13 16:39:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5771 from ctrlaltdavid/20671-tidy

Browse source 
Stop DDE and EyeTracker early but don't destroy until later in shutdown
This commit is contained in:
Howard Stearns 2015-09-10 15:38:16 -07:00
commit 23431efdeb
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
interface/src/Application.cpp
View file

@ -786,12 +786,12 @@ void Application::aboutToQuit() {
}
void Application::cleanupBeforeQuit() {
// Terminate third party processes so that they're not left running in the event of a subsequent shutdown crash
// Stop third party processes so that they're not left running in the event of a subsequent shutdown crash.
#ifdef HAVE_DDE
DependencyManager::destroy<DdeFaceTracker>();
DependencyManager::get<DdeFaceTracker>()->setEnabled(false);
#endif
#ifdef HAVE_IVIEWHMD
DependencyManager::destroy<EyeTracker>();
DependencyManager::get<EyeTracker>()->setEnabled(false, true);
#endif
if (_keyboardFocusHighlightID > 0) {
@ -842,6 +842,14 @@ void Application::cleanupBeforeQuit() {
// destroy the AudioClient so it and its thread have a chance to go down safely
DependencyManager::destroy<AudioClient>();
// Destroy third party processes after scripts have finished using them.
#ifdef HAVE_DDE
DependencyManager::destroy<DdeFaceTracker>();
#endif
#ifdef HAVE_IVIEWHMD
DependencyManager::destroy<EyeTracker>();
#endif
}
void Application::emptyLocalCache() {