summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2017-10-19 10:07:08 -0700
committerBruno de Oliveira Abinader <bruno@mapbox.com>2017-10-19 10:10:29 -0700
commitf776dbafcc6c5d836d5c2ade77ae1baaabdd9c11 (patch)
tree92578287f01ecf4b8794ecd49e813beb4b8770f4
parent5a0e263b3506cc77685f3313980ae034daea85af (diff)
downloadqtlocation-mapboxgl-f776dbafcc6c5d836d5c2ade77ae1baaabdd9c11.tar.gz
Revert "[node] Reuse HeadlessFrontend if any in NodeMap::cancel()"node-v3.5.8-pre.2
This reverts commit ac7b40dc9a14e48ef041b9f2e47f0b563abe64cc.
-rw-r--r--package.json2
-rw-r--r--platform/node/src/node_map.cpp5
2 files changed, 2 insertions, 5 deletions
diff --git a/package.json b/package.json
index cb929d69dd..c8d1200c36 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "@mapbox/mapbox-gl-native",
- "version": "3.5.8-pre.1",
+ "version": "3.5.8-pre.2",
"description": "Renders map tiles with Mapbox GL",
"keywords": [
"mapbox",
diff --git a/platform/node/src/node_map.cpp b/platform/node/src/node_map.cpp
index 198e9301f8..f344461f31 100644
--- a/platform/node/src/node_map.cpp
+++ b/platform/node/src/node_map.cpp
@@ -538,10 +538,7 @@ void NodeMap::cancel() {
// Reset map explicitly as it resets the renderer frontend
map.reset();
- if (!frontend) {
- frontend = std::make_unique<mbgl::HeadlessFrontend>(mbgl::Size{ 256, 256 }, pixelRatio, *this, threadpool);
- }
-
+ frontend = std::make_unique<mbgl::HeadlessFrontend>(mbgl::Size{ 256, 256 }, pixelRatio, *this, threadpool);
map = std::make_unique<mbgl::Map>(*frontend, mapObserver, frontend->getSize(), pixelRatio,
*this, threadpool, mbgl::MapMode::Still);