Commit 9420ed44 authored by Gus Grubba's avatar Gus Grubba

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

Fix typo.
parent 4eedf9d5
...@@ -132,7 +132,7 @@ QGeoTiledMapReplyQGC::networkReplyFinished() ...@@ -132,7 +132,7 @@ QGeoTiledMapReplyQGC::networkReplyFinished()
} }
emit terrainDone(a, QNetworkReply::NoError); emit terrainDone(a, QNetworkReply::NoError);
} else { } 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); setMapImageData(a);
if(!format.isEmpty()) { if(!format.isEmpty()) {
setMapImageFormat(format); setMapImageFormat(format);
...@@ -226,8 +226,5 @@ QGeoTiledMapReplyQGC::timeout() ...@@ -226,8 +226,5 @@ QGeoTiledMapReplyQGC::timeout()
if(_reply) { if(_reply) {
_reply->abort(); _reply->abort();
} }
if ((UrlFactory::MapType)tileSpec().mapId() == UrlFactory::MapType::AirmapElevation) {
emit terrainDone(QByteArray(), QNetworkReply::TimeoutError);
}
emit aborted(); emit aborted();
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment