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-13 14:37:17 -0500
commit7b965beb45ce63cf2d57139b5303b8c98ff9c9fc (patch)
treecc1945d046718dde0f9fe02128bfd9e6bf1a640f
parent0887571053a459d5f8bbb0f1da528e969bed6b47 (diff)
downloadqtlocation-mapboxgl-7b965beb45ce63cf2d57139b5303b8c98ff9c9fc.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);
+ }
}
}