safe thread.join()

mapbox · Feb 20, 2015 · bb8cedf · bb8cedf
1 parent 79c13e2
commit bb8cedf
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
@@ -88,7 +88,9 @@ Map::~Map() {
     assert(asyncTerminate);
     asyncTerminate->send();
 
-    thread.join();
+    if (thread.get_id() != std::thread::id()) {
+        thread.join();
+    }
 
     // Make sure that all of these are empty.
     assert(!sprite);