Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix impatient failover wait loop

Browse Source
This commit is contained in:
oldmud0 2017-11-03 11:55:36 -05:00
parent 294d2150d0
commit d93a558ae7
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
networkmanager.cpp
View File

@ -104,7 +104,7 @@ void NetworkManager::on_srv_lookup()
for (const QDnsServiceRecord &record : srv_records) 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()); ms_socket->connectToHost(record.target(), record.port());
QTime timer; QTime timer;
timer.start(); timer.start();
@ -116,9 +116,12 @@ void NetworkManager::on_srv_lookup()
connected = true; connected = true;
break; 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->abort();
ms_socket->close(); ms_socket->close();
break; break;