diff options
author | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2020-02-13 15:29:37 +0200 |
---|---|---|
committer | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2020-02-14 11:54:02 +0200 |
commit | 12d350ec3c69b8d547eeb92ad2d818ca605308f7 (patch) | |
tree | 3001aad2f8f650235def8d67d8cfe85974a9367d /src | |
parent | d3535f1ca9f7c12b3c2290da3f347e4f95210425 (diff) | |
download | qtlocation-mapboxgl-12d350ec3c69b8d547eeb92ad2d818ca605308f7.tar.gz |
Revert "[core] Fix excessive onSpriteLoaded() notifications"
This reverts commit 80cb05420a86ed53815cae7fb2cb3fddf07dd1d1.
Diffstat (limited to 'src')
-rw-r--r-- | src/mbgl/sprite/sprite_loader.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/sprite/sprite_loader.cpp b/src/mbgl/sprite/sprite_loader.cpp index 6051de7ef4..56f7abd50b 100644 --- a/src/mbgl/sprite/sprite_loader.cpp +++ b/src/mbgl/sprite/sprite_loader.cpp @@ -58,9 +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. - loader->json = std::move(res.data); + loader->json = res.data; emitSpriteLoadedIfComplete(); } }); @@ -73,8 +73,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(). - loader->image = std::move(res.data); + } else { + loader->image = res.data; emitSpriteLoadedIfComplete(); } }); |