diff options
author | Leith Bade <leith@leithalweapon.geek.nz> | 2014-06-24 16:19:47 +1000 |
---|---|---|
committer | Mike Morris <michael.patrick.morris@gmail.com> | 2014-09-10 18:47:13 -0400 |
commit | 7a4c914d05cab81ca55ac3cde478997c6d32477e (patch) | |
tree | 0a13e769a715e03d362ef03ebae57a432641c4bd /src | |
parent | 71549e7b93b6b44ed38e8915d8735c136889c3f1 (diff) | |
download | qtlocation-mapboxgl-7a4c914d05cab81ca55ac3cde478997c6d32477e.tar.gz |
Move notify_map_change() from a global callback, to a callback in
View.
This allows for their to me more than one Map object alive at a
time.
Fixes mapbox/mapbox-gl-native#346
Conflicts:
common/glfw_view.hpp
include/llmr/map/view.hpp
include/mbgl/map/transform.hpp
src/map/map.cpp
src/map/transform.cpp
test/headless.cpp
Diffstat (limited to 'src')
-rw-r--r-- | src/map/map.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/map/map.cpp b/src/map/map.cpp index 00f0ac91cc..e6c4e9d03d 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -156,7 +156,6 @@ void Map::cleanup(uv_async_t *async) { void Map::terminate() { view.make_active(); painter.terminate(); - view.make_inactive(); } void Map::render(uv_async_t *async) { |