diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-04-12 19:24:34 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-04-12 20:15:25 +0300 |
| commit | 2d580364a6cfa28477d66a5197afe373ce8823aa (patch) | |
| tree | 8e679fc56e74ca5f5fa8c6a6ace804cac97d3c1e | |
| parent | 24b4b1b5144f064e7b00a0fcba1b1897182af5b9 (diff) | |
| download | qtlocation-mapboxgl-2d580364a6cfa28477d66a5197afe373ce8823aa.tar.gz | |
[core] Do the MapContext::cleanup() synchronously
This used to be async assuming the libuv behavior of holding the
main loop until all the messages are processed and also for avoiding
a deadlock at exit that no longer exits.
Now that we support multiple main loops implementation on different
platforms, we do the cleanup synchronously to make sure all the
platforms have the same behavior at exit.
Fixes #4631
| -rw-r--r-- | src/mbgl/map/map.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index 4024aaee7e..c9123495cd 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -31,7 +31,7 @@ Map::Map(View& view_, FileSource& fileSource, MapMode mapMode, GLContextMode con Map::~Map() { resume(); - context->invoke(&MapContext::cleanup); + context->invokeSync(&MapContext::cleanup); } void Map::pause() { |