diff options
author | Leith Bade <leith@mapbox.com> | 2015-01-23 00:26:29 +1100 |
---|---|---|
committer | Leith Bade <leith@mapbox.com> | 2015-01-23 00:26:29 +1100 |
commit | d2105a18553f16182bf768499a84518d8cd3c893 (patch) | |
tree | fa97458f63957f804d9182c0a9b592e3f089b5f0 /src | |
parent | 95e653982dd2c3200f85d2e7915c7f38b3ca50f4 (diff) | |
download | qtlocation-mapboxgl-d2105a18553f16182bf768499a84518d8cd3c893.tar.gz |
Fix terminate crash
Diffstat (limited to 'src')
-rw-r--r-- | src/mbgl/map/map.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index a132fccfe8..923ce326a2 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -275,6 +275,7 @@ void Map::run() { checkForPause(); } + view.activate(); setup(); prepare(); @@ -301,6 +302,8 @@ void Map::run() { mode = Mode::None; fileSource.clearLoop(); } + + view.deactivate(); } void Map::checkForPause() { @@ -351,7 +354,6 @@ void Map::swapped() { void Map::terminate() { assert(painter); - view.activate(); painter->terminate(); view.deactivate(); } @@ -361,7 +363,6 @@ void Map::terminate() { void Map::setup() { assert(std::this_thread::get_id() == mapThread); assert(painter); - view.activate(); painter->setup(); } |