Merge branch 'master' of github.com:mapbox/llmr-native

README.md

@@ -1,4 +1,4 @@
-![Travis](https://api.travis-ci.com/mapbox/llmr-native.svg?token=yZ9zvfZwYkJNWivRLoyX)
+[![Travis](https://api.travis-ci.com/mapbox/llmr-native.svg?token=yZ9zvfZwYkJNWivRLoyX)](https://magnum.travis-ci.com/mapbox/llmr-native)
 
 An OpenGL renderer for [Mapbox vector tiles](https://www.mapbox.com/blog/vector-tiles),
 implemented in C++11, targeting iOS & OS X.

ios/MBXViewController.mm

@@ -427,7 +427,14 @@ namespace llmr
 
         void restart()
         {
-            viewController.paused = NO;
+            if ([NSThread isMainThread])
+            {
+                viewController.paused = NO;
+            }
+            else
+            {
+                [viewController performSelectorOnMainThread:@selector(setPaused:) withObject:@(NO) waitUntilDone:NO];
+            }
         }
 
         double time()