diff options
author | Artem Pavlenko <artem@mapnik.org> | 2020-02-14 16:56:46 +0000 |
---|---|---|
committer | Artem Pavlenko <artem@mapnik.org> | 2020-02-14 16:56:46 +0000 |
commit | 145c053a02d918d74002ea690dac398ee588a374 (patch) | |
tree | c645ffaec12822f0668858181248cd7365fc4e20 /src/mbgl/sprite/sprite_loader.cpp | |
parent | 37a4660ca367f141b9e0dedf3932c74f0ee0c920 (diff) | |
parent | 59294aaef333bdd455bd13d6bab6fca730379b52 (diff) | |
download | qtlocation-mapboxgl-upstream/galinelle_setStyle++_updated.tar.gz |
Merge branch 'master' into galinelle_setStyle++_updatedupstream/galinelle_setStyle++_updated
Diffstat (limited to 'src/mbgl/sprite/sprite_loader.cpp')
-rw-r--r-- | src/mbgl/sprite/sprite_loader.cpp | 6 |
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(); } |