Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
2d27243a
Unverified
Commit
2d27243a
authored
Apr 20, 2019
by
Gus Grubba
Committed by
GitHub
Apr 20, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7369 from DonLakeFlyer/TileError
Fix: Tile errors were reported twice
parents
16e93829
ae4d5f6e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
38 additions
and
40 deletions
+38
-40
QGCMapTileSet.cpp
src/QtLocationPlugin/QGCMapTileSet.cpp
+38
-40
No files found.
src/QtLocationPlugin/QGCMapTileSet.cpp
View file @
2d27243a
...
...
@@ -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()
}
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()
}
else
{
qWarning
()
<<
"QGCMapEngineManager::networkReplyFinished() Empty Hash"
;
}
}
reply
->
deleteLater
();
}
...
...
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