Browse Source

Skip emitting terrainDone on timeout as it will get handled by networkReplyError.

Fix typo.
QGC4.4
Gus Grubba 7 years ago
parent
commit
9420ed44c8
  1. 5
      src/QtLocationPlugin/QGeoMapReplyQGC.cpp

5
src/QtLocationPlugin/QGeoMapReplyQGC.cpp

@ -132,7 +132,7 @@ QGeoTiledMapReplyQGC::networkReplyFinished() @@ -132,7 +132,7 @@ QGeoTiledMapReplyQGC::networkReplyFinished()
}
emit terrainDone(a, QNetworkReply::NoError);
} else {
//-- This is a map tile. Process and ache it if valid.
//-- This is a map tile. Process and cache it if valid.
setMapImageData(a);
if(!format.isEmpty()) {
setMapImageFormat(format);
@ -226,8 +226,5 @@ QGeoTiledMapReplyQGC::timeout() @@ -226,8 +226,5 @@ QGeoTiledMapReplyQGC::timeout()
if(_reply) {
_reply->abort();
}
if ((UrlFactory::MapType)tileSpec().mapId() == UrlFactory::MapType::AirmapElevation) {
emit terrainDone(QByteArray(), QNetworkReply::TimeoutError);
}
emit aborted();
}

Loading…
Cancel
Save