2210: Sprites can be removed / updated correctly

1 files changed, 9 insertions, 2 deletions

diff --git a/src/mbgl/sprite/sprite_atlas.cpp b/src/mbgl/sprite/sprite_atlas.cpp
index 6ebebb9507..b04d8edc5f 100644
--- a/src/mbgl/sprite/sprite_atlas.cpp
+++ b/src/mbgl/sprite/sprite_atlas.cpp
@@ -187,8 +187,15 @@ void SpriteAtlas::updateDirty() {
             // The two names match;
             Holder& holder = imageIterator->second;
             holder.texture = spriteIterator->second;
-            copy(holder, imageIterator->first.second);
-
+            if (holder.texture != nullptr)
+            {
+                copy(holder, imageIterator->first.second);
+            }
+            else
+            {
+                images.erase(imageIterator);
+            }
+            
             ++imageIterator;
             // Don't advance the spriteIterator because there might be another sprite with the same
             // name, but a different wrap value.