Showing the changes to interface/src/Application.cpp (1 of 3 files). Show all
Unified · Split
| @@ -1498,6 +1498,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1497 unmodified lines | |||
| 1498 | } | 1498 | } |
| 1499 | 1499 | ||
| 1500 | _connectionMonitor.init(); | 1500 | _connectionMonitor.init(); |
| 1501 | // After all of the constructor is completed, then set firstRun to false. | ||
| 1502 | firstRun.set(false); | ||
| 1501 | } | 1503 | } |
| 1502 | 1504 | ||
| 1503 | // Monitor model assets (e.g., from Clara.io) added to the world that may need resizing. | 1505 | // Monitor model assets (e.g., from Clara.io) added to the world that may need resizing. |
| @@ -1517,9 +1519,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 13 unmodified lines | |||
| 1517 | 1519 | ||
| 1518 | connect(this, &QCoreApplication::aboutToQuit, this, &Application::addAssetToWorldMessageClose); | 1520 | connect(this, &QCoreApplication::aboutToQuit, this, &Application::addAssetToWorldMessageClose); |
| 1519 | connect(&domainHandler, &DomainHandler::hostnameChanged, this, &Application::addAssetToWorldMessageClose); | 1521 | connect(&domainHandler, &DomainHandler::hostnameChanged, this, &Application::addAssetToWorldMessageClose); |
| 1520 | |||
| 1521 | // After all of the constructor is completed, then set firstRun to false. | ||
| 1522 | firstRun.set(false); | ||
| 1523 | } | 1522 | } |
| 1524 | 1523 | ||
| 1525 | void Application::domainConnectionRefused(const QString& reasonMessage, int reasonCodeInt, const QString& extraInfo) { | 1524 | void Application::domainConnectionRefused(const QString& reasonMessage, int reasonCodeInt, const QString& extraInfo) { |
| @@ -4070,6 +4069,7 @@ void Application::setKeyboardFocusOverlay(unsigned int overlayID) { · 2544 unmodified lines | |||
| 4070 | if (overlayType == Web3DOverlay::TYPE && isVisible) { | 4069 | if (overlayType == Web3DOverlay::TYPE && isVisible) { |
| 4071 | auto overlay = std::dynamic_pointer_cast<Web3DOverlay>(getOverlays().getOverlay(overlayID)); | 4070 | auto overlay = std::dynamic_pointer_cast<Web3DOverlay>(getOverlays().getOverlay(overlayID)); |
| 4072 | overlay->setProxyWindow(_window->windowHandle()); | 4071 | overlay->setProxyWindow(_window->windowHandle()); |
| 4072 | |||
| 4073 | if (_keyboardMouseDevice->isActive()) { | 4073 | if (_keyboardMouseDevice->isActive()) { |
| 4074 | _keyboardMouseDevice->pluginFocusOutEvent(); | 4074 | _keyboardMouseDevice->pluginFocusOutEvent(); |
| 4075 | } | 4075 | } |