Browse Source

Prevent double reporting of tile download errors

QGC4.4
Don Gagne 6 years ago
parent
commit
e660cccec5
  1. 8
      src/QtLocationPlugin/QGCMapTileSet.cpp

8
src/QtLocationPlugin/QGCMapTileSet.cpp

@ -268,6 +268,10 @@ QGCCachedTileSet::_networkReplyFinished() @@ -268,6 +268,10 @@ QGCCachedTileSet::_networkReplyFinished()
qWarning() << "QGCMapEngineManager::networkReplyFinished() NULL Reply";
return;
}
if (reply->error() != QNetworkReply::NoError) {
// Error was already handled in _networkReplyError implementation
return;
}
//-- Get tile hash
const QString hash = reply->request().attribute(QNetworkRequest::User).toString();
if(!hash.isEmpty()) {
@ -276,10 +280,6 @@ QGCCachedTileSet::_networkReplyFinished() @@ -276,10 +280,6 @@ QGCCachedTileSet::_networkReplyFinished()
} else {
qWarning() << "QGCMapEngineManager::networkReplyFinished() Reply not in list: " << hash;
}
if (reply->error() != QNetworkReply::NoError) {
qWarning() << "QGCMapEngineManager::networkReplyFinished() Error:" << reply->errorString();
return;
}
qCDebug(QGCCachedTileSetLog) << "Tile fetched" << hash;
QByteArray image = reply->readAll();
UrlFactory::MapType type = getQGCMapEngine()->hashToType(hash);

Loading…
Cancel
Save