prohibit changing the style while the map is rendering

mapbox · Feb 16, 2015 · 053d743 · 053d743
1 parent 9692f45
commit 053d743
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
@@ -353,8 +353,10 @@ void Map::loadStyleURL() {
 
 
 void Map::setStyleJSON(std::string newStyleJSON, const std::string &base) {
-    // TODO: figure out what thread this may be called from
-    // TODO: Make threadsafe.
+    if (active && inUIThread()) {
+        throw util::Exception("Style cannot be changed while the Map is rendering");
+    }
+
     styleJSON.swap(newStyleJSON);
     sprite.reset();
     if (!style) {