ETM-Schurig
/
nymea-app
mirror of https://github.com/nymea/nymea-app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix connecting via preferred connection

pull/773/head
Michael Zanetti 2022-02-20 16:14:43 +01:00
parent 4f9c7a0b88
commit a6318b4987
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libnymea-app/connection/nymeaconnection.cpp
View File

@ -132,7 +132,20 @@ void NymeaConnection::setCurrentHost(NymeaHost *host)
return;
}
m_preferredConnection = nullptr;
if (m_preferredConnection) {
if (host->connections()->find(m_preferredConnection->url())) {
qCInfo(dcNymeaConnection()) << "Setting preferred connection to" << m_preferredConnection->url();
// Unset the preferred connection when it is removed
connect(m_preferredConnection, &Connection::destroyed, this, [=](){
qCWarning(dcNymeaConnection()) << "Unsetting preferred connection as it was destroyed.";
m_preferredConnection = nullptr;
});
} else {
qCWarning(dcNymeaConnection()) << "Connection" << m_preferredConnection << "is not a candidate for" << host->name() << "Not setting preferred connection.";
m_preferredConnection = nullptr;
}
}
if (m_currentTransport) {
m_currentTransport = nullptr;
@ -456,19 +469,7 @@ void NymeaConnection::connectToHost(NymeaHost *nymeaHost, Connection *connection
return;
}
m_preferredConnection = nullptr;
if (connection) {
if (nymeaHost->connections()->find(connection->url())) {
qCInfo(dcNymeaConnection()) << "Setting preferred connection to" << connection->url();
m_preferredConnection = connection;
// Unset the preferred connection when it is removed
connect(connection, &Connection::destroyed, this, [=](){
m_preferredConnection = nullptr;
});
} else {
qCWarning(dcNymeaConnection()) << "Connection" << connection << "is not a candidate for" << nymeaHost->name() << "Not setting preferred connection.";
}
}
m_preferredConnection = connection;
setCurrentHost(nymeaHost);
}