From ffc903de3483e1ff3eb139566a459c842a48e856 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 13 Oct 2018 01:07:45 +0200 Subject: [PATCH] Ref T367, Ref T400 style --- src/blackcore/setupreader.cpp | 33 --------------------------------- src/blackgui/guiapplication.cpp | 2 +- 2 files changed, 1 insertion(+), 34 deletions(-) diff --git a/src/blackcore/setupreader.cpp b/src/blackcore/setupreader.cpp index 0d1e1ace5..8f0770577 100644 --- a/src/blackcore/setupreader.cpp +++ b/src/blackcore/setupreader.cpp @@ -422,24 +422,6 @@ namespace BlackCore // however, store as error because this will be a possible root cause if nothing else is nwReply->abort(); } - - /** - // try next one if any Removed with T367 - if (m_bootstrapUrls.addFailedUrl(url)) - { - CStatusMessage msg = CStatusMessage(this).warning("Reading setup failed %1 %2 (can possibly be fixed by reading from another %3 servers afterwards)") - << replyMessage << urlString - << m_bootstrapUrls.numberOfStillValidUrls(); - this->setLastSetupReadErrorMessages(msg); - CLogMessage::preformatted(msg); - QTimer::singleShot(500, this, &CSetupReader::readSetup); - } - else - { - const CStatusMessageList msgs = this->manageSetupAvailability(false); - CLogMessage::preformatted(msgs); - } - **/ } void CSetupReader::parseUpdateInfoFile(QNetworkReply *nwReplyPtr) @@ -513,21 +495,6 @@ namespace BlackCore // network error, try next URL nwReply->abort(); } - - /** try next one if any Removed with T367 - if (m_updateInfoUrls.addFailedUrl(url)) - { - CLogMessage(this).warning("Reading update info failed %1 %2 (can possibly be fixed by reading from another %3 servers afterwards)") - << replyMessage << urlString - << m_updateInfoUrls.numberOfStillValidUrls(); - QTimer::singleShot(500, this, &CSetupReader::readUpdateInfo); - } - else - { - this->manageUpdateInfoAvailability(false); - CLogMessage(this).error("Reading update info failed %1 %2, failed URLs %3") << replyMessage << urlString << m_updateInfoUrls.getFailedUrlsSize(); - } - **/ } const CLogCategoryList &CSetupReader::getLogCategories() diff --git a/src/blackgui/guiapplication.cpp b/src/blackgui/guiapplication.cpp index 506dae3c1..0286fbc26 100644 --- a/src/blackgui/guiapplication.cpp +++ b/src/blackgui/guiapplication.cpp @@ -851,7 +851,7 @@ namespace BlackGui bool CGuiApplication::parseAndSynchronizeSetup(int timeoutMs) { - if (!this->parseAndStartupCheck()) return false; + if (!this->parseAndStartupCheck()) { return false; } return this->interactivelySynchronizeSetup(timeoutMs); }