summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortobrun <tobrun.van.nuland@gmail.com>2018-08-14 10:29:24 +0200
committertobrun <tobrun.van.nuland@gmail.com>2018-08-14 10:33:14 +0200
commitca80f1c8f18add1506d0b206b26fc634a78690dc (patch)
treeecf8061b85152d174c9ebfa64b92d849559efba0
parent41d5768f5861c200dc0721acb13b39783a168b29 (diff)
downloadqtlocation-mapboxgl-upstream/tvn-prioritise-style-loading.tar.gz
[core] - priortise style loading so offline downloads don't block showing other mapsupstream/tvn-prioritise-style-loading
-rw-r--r--platform/default/online_file_source.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/platform/default/online_file_source.cpp b/platform/default/online_file_source.cpp
index d685109b95..36be147100 100644
--- a/platform/default/online_file_source.cpp
+++ b/platform/default/online_file_source.cpp
@@ -111,7 +111,10 @@ public:
}
void queueRequest(OnlineFileRequest* request) {
- auto it = pendingRequestsList.insert(pendingRequestsList.end(), request);
+ auto it = pendingRequestsList.insert(
+ // prioritise style loading so an ongoing offline download doesn't block showing a new map
+ request->resource.kind == Resource::Style ? pendingRequestsList.begin() : pendingRequestsList.end(), request
+ );
pendingRequestsMap.emplace(request, std::move(it));
assert(pendingRequestsMap.size() == pendingRequestsList.size());
}