From 89129379f18b913a7c2b7a7ff99644e277e9d3ff Mon Sep 17 00:00:00 2001
From: Ivo van Dongen <info@ivovandongen.nl>
Date: Fri, 26 May 2017 17:49:33 +0300
Subject: [core] default file source - ensure thread safety for local file and
 asset requests

---
 include/mbgl/storage/default_file_source.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include/mbgl/storage')

diff --git a/include/mbgl/storage/default_file_source.hpp b/include/mbgl/storage/default_file_source.hpp
index f612a01aac..1e60d2bc5a 100644
--- a/include/mbgl/storage/default_file_source.hpp
+++ b/include/mbgl/storage/default_file_source.hpp
@@ -140,9 +140,9 @@ public:
     class Impl;
 
 private:
+    // Shared so destruction is done on this thread
+    const std::shared_ptr<FileSource> assetFileSource;
     const std::unique_ptr<util::Thread<Impl>> thread;
-    const std::unique_ptr<FileSource> assetFileSource;
-    const std::unique_ptr<FileSource> localFileSource;
     std::string cachedBaseURL = mbgl::util::API_BASE_URL;
     std::string cachedAccessToken;
 };
-- 
cgit v1.2.1