Merge pull request #832 from smartdevicelink/bugs/issue_831_iapsession_assert

Force `stop` to run on the main thread

1 files changed, 10 insertions, 2 deletions

diff --git a/SmartDeviceLink/SDLIAPSession.m b/SmartDeviceLink/SDLIAPSession.m
index db64bf678..33a7cf1f1 100644
--- a/SmartDeviceLink/SDLIAPSession.m
+++ b/SmartDeviceLink/SDLIAPSession.m
@@ -81,8 +81,16 @@ NSTimeInterval const StreamThreadWaitSecs = 1.0;
 
 - (void)stop {
     // This method must be called on the main thread
-    NSAssert([NSThread isMainThread], @"stop must be called on the main thread");
-    
+    if ([NSThread isMainThread]) {
+        [self sdl_stop];
+    } else {
+        dispatch_sync(dispatch_get_main_queue(), ^{
+            [self sdl_stop];
+        });
+    }
+}
+
+- (void)sdl_stop {
     if (self.isDataSession) {
         [self.ioStreamThread cancel];