Showing the changes to interface/src/Application.cpp (1 of 3 files). Show all
Unified · Split
| @@ -146,7 +146,7 @@ · 145 unmodified lines | |||
| 146 | #include "InterfaceLogging.h" | 146 | #include "InterfaceLogging.h" |
| 147 | #include "LODManager.h" | 147 | #include "LODManager.h" |
| 148 | #include "ModelPackager.h" | 148 | #include "ModelPackager.h" |
| 149 | #include "networking/ClosureEventSender.h" | 149 | #include "networking/CloseEventSender.h" |
| 150 | #include "networking/HFWebEngineProfile.h" | 150 | #include "networking/HFWebEngineProfile.h" |
| 151 | #include "networking/HFTabletWebEngineProfile.h" | 151 | #include "networking/HFTabletWebEngineProfile.h" |
| 152 | #include "networking/FileTypeProfile.h" | 152 | #include "networking/FileTypeProfile.h" |
| @@ -537,7 +537,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) { · 384 unmodified lines | |||
| 537 | DependencyManager::set<AvatarBookmarks>(); | 537 | DependencyManager::set<AvatarBookmarks>(); |
| 538 | DependencyManager::set<LocationBookmarks>(); | 538 | DependencyManager::set<LocationBookmarks>(); |
| 539 | DependencyManager::set<Snapshot>(); | 539 | DependencyManager::set<Snapshot>(); |
| 540 | DependencyManager::set<ClosureEventSender>(); | 540 | DependencyManager::set<CloseEventSender>(); |
| 541 | 541 | ||
| 542 | return previousSessionCrashed; | 542 | return previousSessionCrashed; |
| 543 | } | 543 | } |
| @@ -1572,12 +1572,12 @@ void Application::aboutToQuit() { · 1028 unmodified lines | |||
| 1572 | 1572 | ||
| 1573 | getActiveDisplayPlugin()->deactivate(); | 1573 | getActiveDisplayPlugin()->deactivate(); |
| 1574 | 1574 | ||
| 1575 | // use the ClosureEventSender via a QThread to send an event that says the user asked for the app to close | 1575 | // use the CloseEventSender via a QThread to send an event that says the user asked for the app to close |
| 1576 | auto closureEventSender = DependencyManager::get<ClosureEventSender>(); | 1576 | auto closeEventSender = DependencyManager::get<CloseEventSender>(); |
| 1577 | QThread* closureEventThread = new QThread(this); | 1577 | QThread* closureEventThread = new QThread(this); |
| 1578 | closureEventSender->moveToThread(closureEventThread); | 1578 | closeEventSender->moveToThread(closureEventThread); |
| 1579 | // sendQuitEventAsync will bail immediately if the UserActivityLogger is not enabled | 1579 | // sendQuitEventAsync will bail immediately if the UserActivityLogger is not enabled |
| 1580 | connect(closureEventThread, &QThread::started, closureEventSender.data(), &ClosureEventSender::sendQuitEventAsync); | 1580 | connect(closureEventThread, &QThread::started, closeEventSender.data(), &CloseEventSender::sendQuitEventAsync); |
| 1581 | closureEventThread->start(); | 1581 | closureEventThread->start(); |
| 1582 | 1582 | ||
| 1583 | // Hide Running Scripts dialog so that it gets destroyed in an orderly manner; prevents warnings at shutdown. | 1583 | // Hide Running Scripts dialog so that it gets destroyed in an orderly manner; prevents warnings at shutdown. |
| @@ -1745,13 +1745,13 @@ Application::~Application() { · 161 unmodified lines | |||
| 1745 | _window->deleteLater(); | 1745 | _window->deleteLater(); |
| 1746 | 1746 | ||
| 1747 | // make sure that the quit event has finished sending before we take the application down | 1747 | // make sure that the quit event has finished sending before we take the application down |
| 1748 | auto closureEventSender = DependencyManager::get<ClosureEventSender>(); | 1748 | auto closeEventSender = DependencyManager::get<CloseEventSender>(); |
| 1749 | while (!closureEventSender->hasFinishedQuitEvent() && !closureEventSender->hasTimedOutQuitEvent()) { | 1749 | while (!closeEventSender->hasFinishedQuitEvent() && !closeEventSender->hasTimedOutQuitEvent()) { |
| 1750 | // yield so we're not spinning | 1750 | // yield so we're not spinning |
| 1751 | std::this_thread::yield(); | 1751 | std::this_thread::yield(); |
| 1752 | } | 1752 | } |
| 1753 | // quit the thread used by the closure event sender | 1753 | // quit the thread used by the closure event sender |
| 1754 | closureEventSender->thread()->quit(); | 1754 | closeEventSender->thread()->quit(); |
| 1755 | 1755 | ||
| 1756 | // Can't log to file passed this point, FileLogger about to be deleted | 1756 | // Can't log to file passed this point, FileLogger about to be deleted |
| 1757 | qInstallMessageHandler(LogHandler::verboseMessageHandler); | 1757 | qInstallMessageHandler(LogHandler::verboseMessageHandler); |