Merge branch 'develop' into feature/issue_794_CarWindow

2 files changed, 26 insertions, 16 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];
 
diff --git a/SmartDeviceLink/SDLTCPTransport.m b/SmartDeviceLink/SDLTCPTransport.m
index fd37ae153..99e46074c 100644
--- a/SmartDeviceLink/SDLTCPTransport.m
+++ b/SmartDeviceLink/SDLTCPTransport.m
@@ -46,20 +46,22 @@ static void TCPCallback(CFSocketRef socket, CFSocketCallBackType type, CFDataRef
 }
 
 - (void)connect {
-    SDLLogD(@"Attemping to connect");
-
-    int sock_fd = call_socket([self.hostName UTF8String], [self.portNumber UTF8String]);
-    if (sock_fd < 0) {
-        SDLLogE(@"Server not ready, connection failed");
-        return;
-    }
-
-    CFSocketContext socketCtxt = {0, (__bridge void *)(self), NULL, NULL, NULL};
-    socket = CFSocketCreateWithNative(kCFAllocatorDefault, sock_fd, kCFSocketDataCallBack | kCFSocketConnectCallBack, (CFSocketCallBack)&TCPCallback, &socketCtxt);
-    CFRunLoopSourceRef source = CFSocketCreateRunLoopSource(kCFAllocatorDefault, socket, 0);
-    CFRunLoopRef loop = CFRunLoopGetCurrent();
-    CFRunLoopAddSource(loop, source, kCFRunLoopDefaultMode);
-    CFRelease(source);
+    [[NSOperationQueue mainQueue] addOperationWithBlock:^{
+        SDLLogD(@"Attemping to connect");
+        
+        int sock_fd = call_socket([self.hostName UTF8String], [self.portNumber UTF8String]);
+        if (sock_fd < 0) {
+            SDLLogE(@"Server not ready, connection failed");
+            return;
+        }
+        
+        CFSocketContext socketCtxt = {0, (__bridge void *)(self), NULL, NULL, NULL};
+        socket = CFSocketCreateWithNative(kCFAllocatorDefault, sock_fd, kCFSocketDataCallBack | kCFSocketConnectCallBack, (CFSocketCallBack)&TCPCallback, &socketCtxt);
+        CFRunLoopSourceRef source = CFSocketCreateRunLoopSource(kCFAllocatorDefault, socket, 0);
+        CFRunLoopRef loop = CFRunLoopGetCurrent();
+        CFRunLoopAddSource(loop, source, kCFRunLoopDefaultMode);
+        CFRelease(source);
+    }];
 }
 
 - (void)sendData:(NSData *)msgBytes {