diff options
| author | Leith Bade <leith@mapbox.com> | 2015-01-16 10:16:30 +1100 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2015-01-16 10:16:30 +1100 |
| commit | d950e986b78f526c34d37c959f539476f7249c80 (patch) | |
| tree | 11aed290bec4bf2c63f0e68c01998a5031cdb4ab | |
| parent | d24b73b1a67a2ab4f65f413d19374050f17782bb (diff) | |
| parent | 5e44256fe87d78abe282190fb8a41745f8115c5b (diff) | |
| download | qtlocation-mapboxgl-d950e986b78f526c34d37c959f539476f7249c80.tar.gz | |
Merge pull request #757 from mapbox/move-terminate
Move terminate() call to GLFWView to avoid problems with node
| -rw-r--r-- | platform/default/glfw_view.cpp | 3 | ||||
| -rw-r--r-- | src/mbgl/map/map.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/platform/default/glfw_view.cpp b/platform/default/glfw_view.cpp index 17cd78d12b..285a118814 100644 --- a/platform/default/glfw_view.cpp +++ b/platform/default/glfw_view.cpp @@ -286,6 +286,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 a0c143701b..a7c1636f01 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() { |