summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <thiago@mapbox.com>2016-03-17 18:23:02 -0300
committerThiago Marcos P. Santos <thiago@mapbox.com>2016-03-18 00:10:50 -0300
commit115a5d10f90b7da1726e9cb274bfaf58f806e54d (patch)
tree519f557bdaf8bd18ca082ad3fd3e4c564bfafe58
parentbcb3bb0931cbe0a85cb0f4ee9a311eceec7689c7 (diff)
downloadqtlocation-mapboxgl-115a5d10f90b7da1726e9cb274bfaf58f806e54d.tar.gz
[core] Fix regression of prior expiration time not being respected
-rw-r--r--platform/default/online_file_source.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/platform/default/online_file_source.cpp b/platform/default/online_file_source.cpp
index 77dddac112..944bcd56d5 100644
--- a/platform/default/online_file_source.cpp
+++ b/platform/default/online_file_source.cpp
@@ -206,7 +206,11 @@ OnlineFileRequestImpl::OnlineFileRequestImpl(FileRequest* key_, const Resource&
resource(resource_),
callback(std::move(callback_)) {
// Force an immediate first request if we don't have an expiration time.
- schedule(impl, SystemClock::now());
+ if (resource.priorExpires) {
+ schedule(impl, resource.priorExpires);
+ } else {
+ schedule(impl, SystemClock::now());
+ }
}
OnlineFileRequestImpl::~OnlineFileRequestImpl() {