summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeith Bade <leith@mapbox.com>2015-01-16 09:50:05 +1100
committerLeith Bade <leith@mapbox.com>2015-01-16 09:50:05 +1100
commit5e44256fe87d78abe282190fb8a41745f8115c5b (patch)
tree42c7269d96c11ce3af8b51401cd85b8843b3139f
parentc6ca57045fb373d4fd76d1ec228bd35a518d06e8 (diff)
downloadqtlocation-mapboxgl-5e44256fe87d78abe282190fb8a41745f8115c5b.tar.gz
Move terminate() call to GLFWView to avoid problems with node
-rw-r--r--platform/default/glfw_view.cpp3
-rw-r--r--src/mbgl/map/map.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/platform/default/glfw_view.cpp b/platform/default/glfw_view.cpp
index 6446a54abb..3d0d38c0b1 100644
--- a/platform/default/glfw_view.cpp
+++ b/platform/default/glfw_view.cpp
@@ -282,6 +282,9 @@ int GLFWView::run() {
glfwWaitEvents();
});
+ // Terminate here to save binary shaders
+ map->terminate();
+
return 0;
}
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index f78b8385c0..99c8320a0a 100644
--- a/src/mbgl/map/map.cpp
+++ b/src/mbgl/map/map.cpp
@@ -250,8 +250,6 @@ void Map::run() {
mode = Mode::None;
fileSource.clearLoop();
}
-
- terminate();
}
void Map::rerender() {