Reinstate session setup in progress setter to end background task cleanly.

1 files changed, 9 insertions, 1 deletions

diff --git a/SmartDeviceLink/SDLIAPTransport.m b/SmartDeviceLink/SDLIAPTransport.m
index 0aeb2b2e8..2192f8324 100644
--- a/SmartDeviceLink/SDLIAPTransport.m
+++ b/SmartDeviceLink/SDLIAPTransport.m
@@ -35,7 +35,7 @@ int const streamOpenTimeoutSeconds = 2;
 @property (assign) int retryCounter;
 @property (strong) SDLTimer *protocolIndexTimer;
 @property (nonatomic, assign) UIBackgroundTaskIdentifier backgroundTaskId;
-@property (assign) BOOL sessionSetupInProgress;
+@property (nonatomic, assign, setter=setSessionSetupInProgress:) BOOL sessionSetupInProgress;
 
 @end
 
@@ -87,6 +87,14 @@ int const streamOpenTimeoutSeconds = 2;
     [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
+- (void)setSessionSetupInProgress:(BOOL)inProgress{
+    _sessionSetupInProgress = inProgress;
+    if (!inProgress){
+        // End the background task here to catch all cases
+        [self sdl_backgroundTaskEnd];
+    }
+}
+
 - (void)sdl_backgroundTaskStart {
     if (self.backgroundTaskId != UIBackgroundTaskInvalid) {
         return;