summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2015-03-27 17:09:11 +0100
committerKonstantin Käfer <mail@kkaefer.com>2015-03-27 17:09:11 +0100
commite4469c912261ad0711f75f7f0018b9fffa6f91a7 (patch)
treecf4277444497bbbd19885471981b96f56138149e
parent64b60faced2cc3b90aa69813cda369e34eb88f03 (diff)
parent4249c955d04bda86fffc09c2b157ab76a2c9d88e (diff)
downloadqtlocation-mapboxgl-e4469c912261ad0711f75f7f0018b9fffa6f91a7.tar.gz
Merge pull request #1136 from mapbox/1069-annotations-threadsafe-followup
Make sure the app terminates correctly
-rw-r--r--src/mbgl/map/map.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index 47d6ed71d1..0863c8aad6 100644
--- a/src/mbgl/map/map.cpp
+++ b/src/mbgl/map/map.cpp
@@ -137,6 +137,7 @@ void Map::start(bool startPaused) {
// Closes all open handles on the loop. This means that the loop will automatically terminate.
asyncRender.reset();
asyncUpdate.reset();
+ asyncInvoke.reset();
asyncTerminate.reset();
});
@@ -148,7 +149,6 @@ void Map::start(bool startPaused) {
processTasks();
});
-
asyncRender = util::make_unique<uv::async>(env->loop, [this] {
// Must be called in Map thread.
assert(Environment::currentlyOn(ThreadType::Map));