expect onStyleImageMissing listener to add image synchronously

2 files changed, 4 insertions, 10 deletions

diff --git a/include/mbgl/map/map_observer.hpp b/include/mbgl/map/map_observer.hpp
index e405c5dd0e..75e389df9f 100644
--- a/include/mbgl/map/map_observer.hpp
+++ b/include/mbgl/map/map_observer.hpp
@@ -47,7 +47,7 @@ public:
     virtual void onDidFinishLoadingStyle() {}
     virtual void onSourceChanged(style::Source&) {}
     virtual void onDidBecomeIdle() {}
-    virtual void onStyleImageMissing(const std::string&, std::function<void(optional<std::unique_ptr<mbgl::style::Image>>)> callback) { callback({}); }
+    virtual void onStyleImageMissing(const std::string&) {}
 };
 
 } // namespace mbgl
diff --git a/src/mbgl/map/map_impl.cpp b/src/mbgl/map/map_impl.cpp
index 0edf26e262..6cf2b532a4 100644
--- a/src/mbgl/map/map_impl.cpp
+++ b/src/mbgl/map/map_impl.cpp
@@ -174,17 +174,11 @@ void Map::Impl::jumpTo(const CameraOptions& camera) {
 
 void Map::Impl::onStyleImageMissing(const std::string& id, std::function<void()> done) {
 
-    if (style->getImage(id) != nullptr) {
-        done();
-        return;
+    if (style->getImage(id) == nullptr) {
+        observer.onStyleImageMissing(id);
     }
 
-    observer.onStyleImageMissing(id, [this, done](optional<std::unique_ptr<mbgl::style::Image>> image = {}) {
-        if (image) {
-            style->addImage(std::move(*image));
-        }
-        done();
-    });
+    done();
 }
 
 } // namespace mbgl