flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-14 08:45:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T367, Ref T400 style

Browse Source
This commit is contained in:
Klaus Basan
2018-10-13 01:07:45 +02:00
parent c781da60d2
commit ffc903de34
2 changed files with 1 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/blackcore/setupreader.cpp
View File

@@ -422,24 +422,6 @@ namespace BlackCore
// however, store as error because this will be a possible root cause if nothing else is // however, store as error because this will be a possible root cause if nothing else is
nwReply->abort(); 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) void CSetupReader::parseUpdateInfoFile(QNetworkReply *nwReplyPtr)
@@ -513,21 +495,6 @@ namespace BlackCore
// network error, try next URL // network error, try next URL
nwReply->abort(); 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() const CLogCategoryList &CSetupReader::getLogCategories()

2
src/blackgui/guiapplication.cpp
View File

@@ -851,7 +851,7 @@ namespace BlackGui
bool CGuiApplication::parseAndSynchronizeSetup(int timeoutMs) bool CGuiApplication::parseAndSynchronizeSetup(int timeoutMs)
{ {
if (!this->parseAndStartupCheck()) return false; if (!this->parseAndStartupCheck()) { return false; }
return this->interactivelySynchronizeSetup(timeoutMs); return this->interactivelySynchronizeSetup(timeoutMs);
} }