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-27 16:55:33 +0100
commit9261d5df7e9d54bedc3103a41e3eab17ef8d99ff (patch)
tree482f5fa6308c12816ffc36f2a3efe445cfb515e3 /src/mbgl/style/style_impl.cpp
parent94bbe0f907fe1af5de45feb7dc5d793a7535a058 (diff)
downloadqtlocation-mapboxgl-upstream/release-agua__continue-style-loading-despite-mutation.tar.gz
[core] continue loading style even if we mutate itupstream/release-agua__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 3214c6316e..39e1c17722 100644
--- a/src/mbgl/style/style_impl.cpp
+++ b/src/mbgl/style/style_impl.cpp
@@ -53,11 +53,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;