From afa04de15286cdfa1cedc756d8fbe46a42e319a5 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 19 Nov 2015 17:59:21 -0800
Subject: [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.
---
 src/mbgl/map/map_context.cpp | 2 +-
 src/mbgl/style/style.hpp     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

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;
     }
diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp
index 4eef6cce75..dbaf8cf02c 100644
--- a/src/mbgl/style/style.hpp
+++ b/src/mbgl/style/style.hpp
@@ -100,7 +100,6 @@ private:
     void emitTileDataChanged();
     void emitResourceLoadingFailed(std::exception_ptr error);
 
-    bool loaded = false;
     bool shouldReparsePartialTiles = false;
 
     Observer* observer = nullptr;
@@ -112,6 +111,7 @@ private:
     bool hasPendingTransitions = false;
 
 public:
+    bool loaded = false;
     Worker workers;
 };
 
-- 
cgit v1.2.1