Merge branch 'master' into galinelle_setStyle++_updatedupstream/galinelle_setStyle++_updated

1 files changed, 4 insertions, 2 deletions

diff --git a/src/mbgl/sprite/sprite_loader.cpp b/src/mbgl/sprite/sprite_loader.cpp
index 6051de7ef4..60bab2bf6e 100644
--- a/src/mbgl/sprite/sprite_loader.cpp
+++ b/src/mbgl/sprite/sprite_loader.cpp
@@ -58,8 +58,9 @@ void SpriteLoader::load(const std::string& url, FileSource& fileSource) {
         } else if (res.noContent) {
             loader->json = std::make_shared<std::string>();
             emitSpriteLoadedIfComplete();
-        } else if (loader->json != res.data) { // They can be equal, see OnlineFileRequest::completed().
+        } else {
             // Only trigger a sprite loaded event we got new data.
+            assert(loader->json != res.data);
             loader->json = std::move(res.data);
             emitSpriteLoadedIfComplete();
         }
@@ -73,7 +74,8 @@ void SpriteLoader::load(const std::string& url, FileSource& fileSource) {
         } else if (res.noContent) {
             loader->image = std::make_shared<std::string>();
             emitSpriteLoadedIfComplete();
-        } else if (loader->image != res.data) { // They can be equal - see OnlineFileRequest::completed().
+        } else {
+            assert(loader->image != res.data);
             loader->image = std::move(res.data);
             emitSpriteLoadedIfComplete();
         }