From 9420ed44c8c3af02fa545721681a36ebeed81121 Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Mon, 16 Apr 2018 09:23:12 -0400 Subject: [PATCH] Skip emitting terrainDone on timeout as it will get handled by networkReplyError. Fix typo. --- src/QtLocationPlugin/QGeoMapReplyQGC.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/QtLocationPlugin/QGeoMapReplyQGC.cpp b/src/QtLocationPlugin/QGeoMapReplyQGC.cpp index 0ff40a54e..eaee21fc0 100644 --- a/src/QtLocationPlugin/QGeoMapReplyQGC.cpp +++ b/src/QtLocationPlugin/QGeoMapReplyQGC.cpp @@ -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() if(_reply) { _reply->abort(); } - if ((UrlFactory::MapType)tileSpec().mapId() == UrlFactory::MapType::AirmapElevation) { - emit terrainDone(QByteArray(), QNetworkReply::TimeoutError); - } emit aborted(); } -- 2.22.0