From 3c283953ec9cb7ca7198ef4617bf35e944371206 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Wed, 23 Apr 2014 17:20:23 +0200
Subject: [PATCH 1/2] link ci status to travis page

[skip ci]
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5989553a1..5817f3a15 100644
--- a/README.md
+++ b/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.

From 8db741c2347ef02b88264a106f367f2c95ffb723 Mon Sep 17 00:00:00 2001
From: "Justin R. Miller" <incanus@codesorcery.net>
Date: Wed, 23 Apr 2014 09:25:31 -0700
Subject: [PATCH 2/2] properly handle threading for restarts

---
 ios/MBXViewController.mm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ios/MBXViewController.mm b/ios/MBXViewController.mm
index 4a3a9cf2c..cc18e97ed 100644
--- a/ios/MBXViewController.mm
+++ b/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()