feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

zeroconf: avoid double triggering of hadFailure

Browse Source 
Change-Id: Ia4e2da06714b06fc7a98a0acb6d3868fc4bafca9
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@nokia.com>
This commit is contained in:
Fawzi Mohamed
2012-03-26 14:42:29 +02:00
parent 6ff4a0b586
commit 8abf7b9aa1
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libs/zeroconf/servicebrowser.cpp
View File

@@ -1852,8 +1852,9 @@ void MainConnection::handleEvents()
if (m_nErrs > 0){ if (m_nErrs > 0){
QString browsersNames = (m_browsers.isEmpty() ? QString() : m_browsers.at(0)->serviceType) QString browsersNames = (m_browsers.isEmpty() ? QString() : m_browsers.at(0)->serviceType)
+ ((m_browsers.count() > 1) ? QString::fromLatin1(",...") : QString()); + ((m_browsers.count() > 1) ? QString::fromLatin1(",...") : QString());
appendError(ErrorMessage::FailureLevel, tr("MainConnection for [%1] accumulated %2 consecutive errors, aborting") if (isOk())
.arg(browsersNames).arg(m_nErrs)); appendError(ErrorMessage::FailureLevel, tr("MainConnection for [%1] accumulated %2 consecutive errors, aborting")
.arg(browsersNames).arg(m_nErrs));
} }
increaseStatusTo(Stopped); increaseStatusTo(Stopped);
} }