Browse Source

Merge pull request #7369 from DonLakeFlyer/TileError

Fix: Tile errors were reported twice
QGC4.4
Gus Grubba 6 years ago committed by GitHub
parent
commit
2d27243a8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      src/QtLocationPlugin/QGCMapTileSet.cpp

6
src/QtLocationPlugin/QGCMapTileSet.cpp

@ -268,6 +268,7 @@ QGCCachedTileSet::_networkReplyFinished() @@ -268,6 +268,7 @@ QGCCachedTileSet::_networkReplyFinished()
qWarning() << "QGCMapEngineManager::networkReplyFinished() NULL Reply";
return;
}
if (reply->error() == QNetworkReply::NoError) {
//-- Get tile hash
const QString hash = reply->request().attribute(QNetworkRequest::User).toString();
if(!hash.isEmpty()) {
@ -276,10 +277,6 @@ QGCCachedTileSet::_networkReplyFinished() @@ -276,10 +277,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);
@ -311,6 +308,7 @@ QGCCachedTileSet::_networkReplyFinished() @@ -311,6 +308,7 @@ QGCCachedTileSet::_networkReplyFinished()
} else {
qWarning() << "QGCMapEngineManager::networkReplyFinished() Empty Hash";
}
}
reply->deleteLater();
}

Loading…
Cancel
Save