summaryrefslogtreecommitdiff
path: root/src/mbgl/style/style_impl.cpp
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2018-02-21 12:35:44 +0100
committerKonstantin Käfer <mail@kkaefer.com>2018-02-22 10:34:05 +0100
commitf4cd73bf9c032783ef9a92a3c661a91629d21818 (patch)
tree833bd31d8a59adb195c6674d21bebf6c6df490e0 /src/mbgl/style/style_impl.cpp
parentfcf5fa6bbb6600c9c00d019b89c6d8c9da0960f5 (diff)
downloadqtlocation-mapboxgl-upstream/continue-style-loading-despite-mutation.tar.gz
[core] continue loading style even if we mutate itupstream/continue-style-loading-despite-mutation
When we load a stale style from cache, and the user immediately starts mutating it, we should continue loading the style so that we'll get a fresh copy of the data into our cache and avoid perpetually showing the stale style.
Diffstat (limited to 'src/mbgl/style/style_impl.cpp')
-rw-r--r--src/mbgl/style/style_impl.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/mbgl/style/style_impl.cpp b/src/mbgl/style/style_impl.cpp
index d330b3120a..0c7f924917 100644
--- a/src/mbgl/style/style_impl.cpp
+++ b/src/mbgl/style/style_impl.cpp
@@ -55,11 +55,6 @@ void Style::Impl::loadURL(const std::string& url_) {
url = url_;
styleRequest = fileSource.request(Resource::style(url), [this](Response res) {
- // Once we get a fresh style, or the style is mutated, stop revalidating.
- if (res.isFresh() || mutated) {
- styleRequest.reset();
- }
-
// Don't allow a loaded, mutated style to be overwritten with a new version.
if (mutated && loaded) {
return;