From 8abf7b9aa1b552b2974bf1e9ccba1923c04a00f3 Mon Sep 17 00:00:00 2001
From: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Date: Mon, 26 Mar 2012 14:42:29 +0200
Subject: [PATCH] zeroconf: avoid double triggering of hadFailure
Change-Id: Ia4e2da06714b06fc7a98a0acb6d3868fc4bafca9
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@nokia.com>
---
src/libs/zeroconf/servicebrowser.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/libs/zeroconf/servicebrowser.cpp b/src/libs/zeroconf/servicebrowser.cpp
index 645f923e130..7475997bc06 100644
--- a/src/libs/zeroconf/servicebrowser.cpp
+++ b/src/libs/zeroconf/servicebrowser.cpp
@@ -1852,8 +1852,9 @@ void MainConnection::handleEvents()
if (m_nErrs > 0){
QString browsersNames = (m_browsers.isEmpty() ? QString() : m_browsers.at(0)->serviceType)
+ ((m_browsers.count() > 1) ? QString::fromLatin1(",...") : QString());
- appendError(ErrorMessage::FailureLevel, tr("MainConnection for [%1] accumulated %2 consecutive errors, aborting")
- .arg(browsersNames).arg(m_nErrs));
+ if (isOk())
+ appendError(ErrorMessage::FailureLevel, tr("MainConnection for [%1] accumulated %2 consecutive errors, aborting")
+ .arg(browsersNames).arg(m_nErrs));
}
increaseStatusTo(Stopped);
}
--
GitLab