Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
9420ed44
Commit
9420ed44
authored
Apr 16, 2018
by
Gus Grubba
Browse files
Skip emitting terrainDone on timeout as it will get handled by networkReplyError.
Fix typo.
parent
4eedf9d5
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/QtLocationPlugin/QGeoMapReplyQGC.cpp
View file @
9420ed44
...
...
@@ -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
c
ache 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
();
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment