Merge PR #3172: ServerResolver: treat SRV lookups that return NOERROR…

… but no records as errors.
mumble-voip · Jul 13, 2017 · 9d4691c · 9d4691c
2 parents d6e327d + 2bd0b7e
commit 9d4691c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/ServerResolver_qt5.cpp b/src/ServerResolver_qt5.cpp
@@ -67,10 +67,10 @@ QList<ServerResolverRecord> ServerResolverPrivate::records() {
 void ServerResolverPrivate::srvResolved() {
 	QDnsLookup *resolver = qobject_cast<QDnsLookup *>(sender());
 
-	if (resolver->error() == QDnsLookup::NoError) {
+	m_srvQueue = resolver->serviceRecords();
-		m_srvQueue = resolver->serviceRecords();
+	m_srvQueueRemain = m_srvQueue.count();
-		m_srvQueueRemain = m_srvQueue.count();
 
+	if (resolver->error() == QDnsLookup::NoError && m_srvQueueRemain > 0) {
 		for (int i = 0; i < m_srvQueue.count(); i++) {
 			QDnsServiceRecord record = m_srvQueue.at(i);
 			int hostInfoId = QHostInfo::lookupHost(record.target(), this, SLOT(hostResolved(QHostInfo)));