From d93a558ae778de60820c051e90c2a8386a750974 Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Fri, 3 Nov 2017 11:55:36 -0500 Subject: [PATCH] Fix impatient failover wait loop --- networkmanager.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/networkmanager.cpp b/networkmanager.cpp index 4eaecd7..3c59a82 100644 --- a/networkmanager.cpp +++ b/networkmanager.cpp @@ -104,7 +104,7 @@ void NetworkManager::on_srv_lookup() for (const QDnsServiceRecord &record : srv_records) { - qDebug() << "Connecting to " << record.target(); + qDebug() << "Connecting to " << record.target() << ":" << record.port(); ms_socket->connectToHost(record.target(), record.port()); QTime timer; timer.start(); @@ -116,9 +116,12 @@ void NetworkManager::on_srv_lookup() connected = true; break; } - else if (ms_socket->error() != -1) + else if (ms_socket->state() != QAbstractSocket::ConnectingState + && ms_socket->state() != QAbstractSocket::HostLookupState + && ms_socket->error() != -1) { - qWarning(QString("Error connecting to master server: %1").arg(ms_socket->errorString()).toStdString().c_str()); + qDebug() << ms_socket->error(); + qWarning() << "Error connecting to master server:" << ms_socket->errorString(); ms_socket->abort(); ms_socket->close(); break;