Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all
Unified · Split
| @@ -994,7 +994,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) : · 993 unmodified lines | ||
| 994 | 994 | if (_keyboardFocusedItem != entityItemID) { |
| 995 | 995 | _keyboardFocusedItem = UNKNOWN_ENTITY_ID; |
| 996 | 996 | auto properties = entityScriptingInterface->getEntityProperties(entityItemID); |
| 997 | − if (EntityTypes::Web == properties.getType() && !properties.getLocked()) { | |
| 997 | + if (EntityTypes::Web == properties.getType() && !properties.getLocked() && properties.getVisible()) { | |
| 998 | 998 | auto entity = entityScriptingInterface->getEntityTree()->findEntityByID(entityItemID); |
| 999 | 999 | RenderableWebEntityItem* webEntity = dynamic_cast<RenderableWebEntityItem*>(entity.get()); |
| 1000 | 1000 | if (webEntity) { |
| @@ -1049,6 +1049,13 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) : · 48 unmodified lines | ||
| 1049 | 1049 | } |
| 1050 | 1050 | }); |
| 1051 | 1051 | |
| 1052 | + connect(this, &Application::aboutToQuit, [=]() { | |
| 1053 | + _keyboardFocusedItem = UNKNOWN_ENTITY_ID; | |
| 1054 | + if (_keyboardFocusHighlight) { | |
| 1055 | + _keyboardFocusHighlight->setVisible(false); | |
| 1056 | + } | |
| 1057 | + }); | |
| 1058 | + | |
| 1052 | 1059 | // Make sure we don't time out during slow operations at startup |
| 1053 | 1060 | updateHeartbeat(); |
| 1054 | 1061 | |