Merge branch 'davidswi-bugfix/issue_648' into develop

1 files changed, 6 insertions, 2 deletions

diff --git a/SmartDeviceLink/SDLIAPTransport.m b/SmartDeviceLink/SDLIAPTransport.m
index a4f2d59cf..3386a298a 100644
--- a/SmartDeviceLink/SDLIAPTransport.m
+++ b/SmartDeviceLink/SDLIAPTransport.m
@@ -171,9 +171,13 @@ int const streamOpenTimeoutSeconds = 2;
     // Stop event listening here so that even if the transport is disconnected by the proxy
     // we unregister for accessory local notifications
     [self sdl_stopEventListening];
-    // Only disconnect the data session, the control session does not stay open and is handled separately
-    if (self.session != nil) {
+    if (self.controlSession != nil) {
+        [self.controlSession stop];
+        self.controlSession.streamDelegate = nil;
+        self.controlSession = nil;
+    } else if (self.session != nil) {
         [self.session stop];
+        self.session.streamDelegate = nil;
         self.session = nil;
     }
 }