Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 20:48:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix operator precedence warning

Browse source
This commit is contained in:
Dale Glass 2022-06-05 13:19:06 +02:00
parent efdc1e9058
commit e8d8657f64
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/networking/src/udt/NetworkSocket.cpp
View file

@ -193,7 +193,7 @@ qint64 NetworkSocket::readDatagram(char* data, qint64 maxSize, SockAddr* sockAdd
#if defined(WEBRTC_DATA_CHANNELS) #if defined(WEBRTC_DATA_CHANNELS)
// Read per preceding pendingDatagramSize() if any, otherwise alternate socket types. // Read per preceding pendingDatagramSize() if any, otherwise alternate socket types.
if (_pendingDatagramSizeSocketType == SocketType::UDP if (_pendingDatagramSizeSocketType == SocketType::UDP
|| _pendingDatagramSizeSocketType == SocketType::Unknown && _lastSocketTypeRead == SocketType::WebRTC) { || (_pendingDatagramSizeSocketType == SocketType::Unknown && _lastSocketTypeRead == SocketType::WebRTC)) {
_lastSocketTypeRead = SocketType::UDP; _lastSocketTypeRead = SocketType::UDP;
_pendingDatagramSizeSocketType = SocketType::Unknown; _pendingDatagramSizeSocketType = SocketType::Unknown;
if (sockAddr) { if (sockAddr) {

2
libraries/networking/src/webrtc/WebRTCDataChannels.cpp
View file

@ -509,7 +509,7 @@ void WebRTCDataChannels::onSignalingMessage(const QJsonObject& message) {
auto from = message.value("from").toString(); auto from = message.value("from").toString();
auto to = NodeType::fromChar(message.value("to").toString().at(0)); auto to = NodeType::fromChar(message.value("to").toString().at(0));
if (!DATA_CHANNEL_ID_REGEX.match(from).hasMatch() || to == NodeType::Unassigned if (!DATA_CHANNEL_ID_REGEX.match(from).hasMatch() || to == NodeType::Unassigned
|| !data.contains("description") && !data.contains("candidate")) { || (!data.contains("description") && !data.contains("candidate"))) {
qCWarning(networking_webrtc) << "Invalid or unexpected signaling message:" qCWarning(networking_webrtc) << "Invalid or unexpected signaling message:"
<< QJsonDocument(message).toJson(QJsonDocument::Compact).left(MAX_DEBUG_DETAIL_LENGTH); << QJsonDocument(message).toJson(QJsonDocument::Compact).left(MAX_DEBUG_DETAIL_LENGTH);
return; return;