From 54ca0c357bf522cb01fa3ee2f1131aac9b9c0cc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Thu, 27 Jul 2017 21:12:38 +0200
Subject: [core] make sure that 304 Not Modified requests correctly update tile
 state

---
 src/mbgl/tile/vector_tile.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/mbgl/tile/vector_tile.cpp')

diff --git a/src/mbgl/tile/vector_tile.cpp b/src/mbgl/tile/vector_tile.cpp
index f03f836851..e22ccf0d54 100644
--- a/src/mbgl/tile/vector_tile.cpp
+++ b/src/mbgl/tile/vector_tile.cpp
@@ -21,7 +21,7 @@ void VectorTile::setError(std::exception_ptr err, const bool complete) {
     GeometryTile::setError(err);
 }
 
-void VectorTile::setData(std::shared_ptr<const std::string> data_,
+void VectorTile::setData(optional<std::shared_ptr<const std::string>> data,
                          optional<Timestamp> modified_,
                          optional<Timestamp> expires_,
                          const bool complete) {
@@ -29,7 +29,9 @@ void VectorTile::setData(std::shared_ptr<const std::string> data_,
     modified = modified_;
     expires = expires_;
 
-    GeometryTile::setData(data_ ? std::make_unique<VectorTileData>(data_) : nullptr);
+    if (data) {
+        GeometryTile::setData(*data ? std::make_unique<VectorTileData>(*data) : nullptr);
+    }
 }
 
 } // namespace mbgl
-- 
cgit v1.2.1