[core] clear source when removed from style

davidchiles · Mar 7, 2017 · 0da6d8a · 0da6d8a
1 parent 84f69bf
commit 0da6d8a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/src/mbgl/style/source_impl.cpp b/src/mbgl/style/source_impl.cpp
@@ -44,6 +44,10 @@ bool Source::Impl::isLoaded() const {
 
     return true;
 }
+
+void Source::Impl::detach() {
+    invalidateTiles();
+}
 
 void Source::Impl::invalidateTiles() {
     tiles.clear();

diff --git a/src/mbgl/style/source_impl.hpp b/src/mbgl/style/source_impl.hpp
@@ -87,6 +87,9 @@ class Source::Impl : public TileObserver, private util::noncopyable {
     // be initialized to true so that Style::isLoaded() does not produce false positives if
     // called before Style::recalculate().
     bool enabled = true;
+
+    // Detaches from the style
+    void detach();
 
 protected:
     void invalidateTiles();

diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp
@@ -166,6 +166,7 @@ std::unique_ptr<Source> Style::removeSource(const std::string& id) {
     sources.erase(it);
     updateBatch.sourceIDs.erase(id);
 
+    source->baseImpl->detach();
     return source;
 }