[core] MapChangeDidFinishLoadingStyle - Ensure style is loaded (#6392)

mapbox · Sep 20, 2016 · 8b0694b · 8b0694b
1 parent f3b38df
commit 8b0694b
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp
@@ -103,10 +103,7 @@ void Style::setJSON(const std::string& json) {
         Log::Error(Event::ParseStyle, "Failed to parse style: %s", util::toString(error).c_str());
         observer->onStyleError();
         observer->onResourceError(error);
-
         return;
-    } else {
-        observer->onStyleLoaded();
     }
 
     for (auto& source : parser.sources) {
@@ -127,6 +124,8 @@ void Style::setJSON(const std::string& json) {
     spriteAtlas->load(parser.spriteURL, fileSource);
 
     loaded = true;
+
+    observer->onStyleLoaded();
 }
 
 void Style::addSource(std::unique_ptr<Source> source) {