summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Morris <michael.patrick.morris@gmail.com>2015-11-12 18:05:19 -0500
committerMike Morris <michael.patrick.morris@gmail.com>2015-11-12 18:21:12 -0500
commit5bf8990894b6eba5bfed385e33e0b09013e504d0 (patch)
tree5982ab48c78599fdd5f858fd53afdae30668fea7
parent549bd366bf39f8ada152b61500af9bfa6d71a2eb (diff)
downloadqtlocation-mapboxgl-5bf8990894b6eba5bfed385e33e0b09013e504d0.tar.gz
[core] safe RequestHolder::Deleter
-rw-r--r--src/mbgl/storage/request_holder.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mbgl/storage/request_holder.cpp b/src/mbgl/storage/request_holder.cpp
index 3a038623c4..d8e4d65c05 100644
--- a/src/mbgl/storage/request_holder.cpp
+++ b/src/mbgl/storage/request_holder.cpp
@@ -6,7 +6,11 @@ namespace mbgl {
void RequestHolder::Deleter::operator()(Request* req) const {
// This function is called by the unique_ptr's Deleter.
- util::ThreadContext::getFileSource()->cancel(req);
+ auto fs = util::ThreadContext::getFileSource();
+
+ if (fs) {
+ fs->cancel(req);
+ }
}
}