summaryrefslogtreecommitdiff
path: root/src/mbgl/map
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2015-11-19 17:59:21 -0800
committerJohn Firebaugh <john.firebaugh@gmail.com>2015-11-19 18:01:42 -0800
commitafa04de15286cdfa1cedc756d8fbe46a42e319a5 (patch)
treed757cccb4ad56cf45ed46f06fc4e068478f74112 /src/mbgl/map
parentdc5a55c6704233780b605ee9dac1ca98d23a97e2 (diff)
downloadqtlocation-mapboxgl-afa04de15286cdfa1cedc756d8fbe46a42e319a5.tar.gz
[core] Followup fix to #3037
The previous fix resulted in annotations sometimes never being added. This would happen if, during the execution of MapContext::update where Update::Annotations was set, the style itself was loaded but some of its subresources (sprite or sources) were not. #3082 is a follow up issue to make MapContext::update less error-prone.
Diffstat (limited to 'src/mbgl/map')
-rw-r--r--src/mbgl/map/map_context.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mbgl/map/map_context.cpp b/src/mbgl/map/map_context.cpp
index 3db1138dfd..cf06dd06eb 100644
--- a/src/mbgl/map/map_context.cpp
+++ b/src/mbgl/map/map_context.cpp
@@ -169,7 +169,7 @@ void MapContext::update() {
data.setAnimationTime(Clock::now());
- if (style->isLoaded() && updateFlags & Update::Annotations) {
+ if (style->loaded && updateFlags & Update::Annotations) {
data.getAnnotationManager()->updateStyle(*style);
updateFlags |= Update::Classes;
}