Showing the changes to assignment-client/src/scripts/EntityScriptServer.cpp (1 of 6 files). Show all
Unified · Split
| @@ -182,23 +182,21 @@ void EntityScriptServer::updateEntityPPS() { · 181 unmodified lines | |||
| 182 | void EntityScriptServer::handleEntityServerScriptLogPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) { | 182 | void EntityScriptServer::handleEntityServerScriptLogPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) { |
| 183 | // These are temporary checks until we can ensure that nodes eventually disconnect if the Domain Server stops telling them | 183 | // These are temporary checks until we can ensure that nodes eventually disconnect if the Domain Server stops telling them |
| 184 | // about each other. | 184 | // about each other. |
| 185 | if (senderNode->getCanRez()) { | 185 | bool enable = false; |
| 186 | bool enable = false; | 186 | message->readPrimitive(&enable); |
| 187 | message->readPrimitive(&enable); | ||
| 188 | 187 | ||
| 189 | auto senderUUID = senderNode->getUUID(); | 188 | auto senderUUID = senderNode->getUUID(); |
| 190 | auto it = _logListeners.find(senderUUID); | 189 | auto it = _logListeners.find(senderUUID); |
| 191 | 190 | ||
| 192 | if (enable) { | 191 | if (enable && senderNode->getCanRez()) { |
| 193 | if (it == std::end(_logListeners)) { | 192 | if (it == std::end(_logListeners)) { |
| 194 | _logListeners.insert(senderUUID); | 193 | _logListeners.insert(senderUUID); |
| 195 | qInfo() << "Node" << senderUUID << "subscribed to log stream"; | 194 | qInfo() << "Node" << senderUUID << "subscribed to log stream"; |
| 196 | } | 195 | } |
| 197 | } else { | 196 | } else { |
| 198 | if (it != std::end(_logListeners)) { | 197 | if (it != std::end(_logListeners)) { |
| 199 | _logListeners.erase(it); | 198 | _logListeners.erase(it); |
| 200 | qInfo() << "Node" << senderUUID << "unsubscribed from log stream"; | 199 | qInfo() << "Node" << senderUUID << "unsubscribed from log stream"; |
| 201 | } | ||
| 202 | } | 200 | } |
| 203 | } | 201 | } |
| 204 | } | 202 | } |