History

Terminate DDE earlier during shut-down and always at start-up

David Rowe committed 11 years ago

Commit 01d7e681 parent 74c92af2 files · +10 −10Browse files

Showing the changes to interface/src/Application.cpp (1 of 2 files). Show all

Unified · Split

interface/src/Application.cpp+8−7
@@ -786,6 +786,14 @@ void Application::aboutToQuit() { · 785 unmodified lines
786}786}
787 787
788void Application::cleanupBeforeQuit() {788void Application::cleanupBeforeQuit() {
789 // Terminate third party processes so that they're not left running in the event of a subsequent shutdown crash
790#ifdef HAVE_DDE
791 DependencyManager::destroy<DdeFaceTracker>();
792#endif
793#ifdef HAVE_IVIEWHMD
794 DependencyManager::destroy<EyeTracker>();
795#endif
796
789 if (_keyboardFocusHighlightID > 0) {797 if (_keyboardFocusHighlightID > 0) {
790 getOverlays().deleteOverlay(_keyboardFocusHighlightID);798 getOverlays().deleteOverlay(_keyboardFocusHighlightID);
791 _keyboardFocusHighlightID = -1;799 _keyboardFocusHighlightID = -1;
@@ -833,13 +841,6 @@ void Application::cleanupBeforeQuit() { · 41 unmodified lines
833 841
834 // destroy the AudioClient so it and its thread have a chance to go down safely842 // destroy the AudioClient so it and its thread have a chance to go down safely
835 DependencyManager::destroy<AudioClient>();843 DependencyManager::destroy<AudioClient>();
836
837#ifdef HAVE_DDE
838 DependencyManager::destroy<DdeFaceTracker>();
839#endif
840#ifdef HAVE_IVIEWHMD
841 DependencyManager::destroy<EyeTracker>();
842#endif
843}844}
844 845
845void Application::emptyLocalCache() {846void Application::emptyLocalCache() {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t