summaryrefslogtreecommitdiff
path: root/src/mbgl/renderer/image_manager.cpp
diff options
context:
space:
mode:
authorAnsis Brammanis <ansis@mapbox.com>2019-04-08 11:16:22 -0400
committerAnsis Brammanis <ansis@mapbox.com>2019-04-08 11:16:22 -0400
commit01ba61266496fb0deb8c561b3deefa1065fbe0a1 (patch)
tree43e003721d55df4d50038e5d062ef90a25f4f999 /src/mbgl/renderer/image_manager.cpp
parent744ce2c02635b29076edf28ec4cccafa424c41fc (diff)
downloadqtlocation-mapboxgl-01ba61266496fb0deb8c561b3deefa1065fbe0a1.tar.gz
fix firing onStyleImageMissing after sprite has loaded
Diffstat (limited to 'src/mbgl/renderer/image_manager.cpp')
-rw-r--r--src/mbgl/renderer/image_manager.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mbgl/renderer/image_manager.cpp b/src/mbgl/renderer/image_manager.cpp
index f8f3e30f81..c740de0e13 100644
--- a/src/mbgl/renderer/image_manager.cpp
+++ b/src/mbgl/renderer/image_manager.cpp
@@ -90,19 +90,19 @@ void ImageManager::getImages(ImageRequestor& requestor, ImageRequestPair&& pair)
// if all icons are available. If any are missing, call `onStyleImageMissing`
// to give the user a chance to provide the icon. If they are not provided
// by the next frame we'll assume they are permanently missing.
- bool hasAllDependencies = true;
if (!isLoaded()) {
+ bool hasAllDependencies = true;
for (const auto& dependency : pair.first) {
if (images.find(dependency.first) == images.end()) {
hasAllDependencies = false;
}
}
- }
- if (hasAllDependencies) {
- notify(requestor, pair);
- } else if (!isLoaded()) {
- requestors.emplace(&requestor, std::move(pair));
+ if (hasAllDependencies) {
+ notify(requestor, pair);
+ } else {
+ requestors.emplace(&requestor, std::move(pair));
+ }
} else {
checkMissingAndNotify(requestor, std::move(pair));
}