Move control session teardown to SDLIAPTransport disconnect.

1 files changed, 10 insertions, 4 deletions

diff --git a/SmartDeviceLink/SDLIAPTransport.m b/SmartDeviceLink/SDLIAPTransport.m
index 88d380133..5d8585c11 100644
--- a/SmartDeviceLink/SDLIAPTransport.m
+++ b/SmartDeviceLink/SDLIAPTransport.m
@@ -141,10 +141,16 @@ 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) {
-        [self.session stop];
-        self.session = nil;
+    if (self.controlSession) {
+        [self.controlSession.streamDelegate clearHandlers];
+        self.controlSession.streamDelegate = nil;
+        [self.controlSession stop];
+    } else {
+        if (self.session != nil) {
+            [self.session.streamDelegate clearHandlers];
+            self.session.streamDelegate = nil;
+            [self.session stop];
+        }
     }
 }