Skip to content
GitLab
Commit 70d49461 authored by Lorenz Meier's avatar Lorenz Meier
Browse files

Merge pull request #1600 from dogmaphobic/udpFix 

Fixing UDP connections issues.
parents 1c03185a f9e571b4
Hide whitespace changes
Inline Side-by-side
src/comm/UDPLink.cc
View file @ 70d49461
...@@ -218,6 +218,7 @@ bool UDPLink::_disconnect(void) ...@@ -218,6 +218,7 @@ bool UDPLink::_disconnect(void)
this->wait(); this->wait();
if (_socket) { if (_socket) {
// Make sure delete happen on correct thread // Make sure delete happen on correct thread
_socket->close();
_socket->deleteLater(); _socket->deleteLater();
_socket = NULL; _socket = NULL;
emit disconnected(); emit disconnected();
...@@ -250,10 +251,12 @@ bool UDPLink::_hardwareConnect() ...@@ -250,10 +251,12 @@ bool UDPLink::_hardwareConnect()
QHostAddress host = QHostAddress::Any; QHostAddress host = QHostAddress::Any;
_socket = new QUdpSocket(); _socket = new QUdpSocket();
_socket->setProxy(QNetworkProxy::NoProxy); _socket->setProxy(QNetworkProxy::NoProxy);
_connectState = _socket->bind(host, _config->localPort()); _connectState = _socket->bind(host, _config->localPort(), QAbstractSocket::ReuseAddressHint);
QObject::connect(_socket, SIGNAL(readyRead()), this, SLOT(readBytes()));
if (_connectState) { if (_connectState) {
QObject::connect(_socket, SIGNAL(readyRead()), this, SLOT(readBytes()));
emit connected(); emit connected();
} else {
emit communicationError("UDP Link Error", "Error binding UDP port");
} }
return _connectState; return _connectState;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment