summaryrefslogtreecommitdiff
path: root/src/mbgl/map/sprite.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbgl/map/sprite.cpp')
-rw-r--r--src/mbgl/map/sprite.cpp18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/mbgl/map/sprite.cpp b/src/mbgl/map/sprite.cpp
index 84e01324b5..518979c5f0 100644
--- a/src/mbgl/map/sprite.cpp
+++ b/src/mbgl/map/sprite.cpp
@@ -47,13 +47,14 @@ Sprite::Sprite(const std::string& baseUrl, float pixelRatio_)
return;
}
loader->jsonRequest = nullptr;
- if (res.status == Response::Successful) {
- loader->json = res.data;
- } else {
+
+ if (res.error) {
std::stringstream message;
- message << "Failed to load [" << jsonURL << "]: " << res.message;
+ message << "Failed to load [" << jsonURL << "]: " << res.error->message;
emitSpriteLoadingFailed(message.str());
return;
+ } else {
+ loader->json = res.data;
}
emitSpriteLoadedIfComplete();
});
@@ -66,13 +67,14 @@ Sprite::Sprite(const std::string& baseUrl, float pixelRatio_)
return;
}
loader->spriteRequest = nullptr;
- if (res.status == Response::Successful) {
- loader->image = res.data;
- } else {
+
+ if (res.error) {
std::stringstream message;
- message << "Failed to load [" << spriteURL << "]: " << res.message;
+ message << "Failed to load [" << spriteURL << "]: " << res.error->message;
emitSpriteLoadingFailed(message.str());
return;
+ } else {
+ loader->image = res.data;
}
emitSpriteLoadedIfComplete();
});