Update SDLLockScreenManager.m

Fix for proposal

1 files changed, 8 insertions, 1 deletions

diff --git a/SmartDeviceLink/SDLLockScreenManager.m b/SmartDeviceLink/SDLLockScreenManager.m
index 81654b074..0ffba3f7c 100644
--- a/SmartDeviceLink/SDLLockScreenManager.m
+++ b/SmartDeviceLink/SDLLockScreenManager.m
@@ -170,12 +170,19 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)sdl_updateLockScreenDismissable {
-    if (self.lastDriverDistractionNotification == nil || self.lastDriverDistractionNotification.lockScreenDismissalEnabled == nil ||
+    if (self.lastDriverDistractionNotification == nil ||
+        self.lastDriverDistractionNotification.lockScreenDismissalEnabled == nil ||
         !self.lastDriverDistractionNotification.lockScreenDismissalEnabled.boolValue) {
         self.lockScreenDismissable = NO;
     } else {
         self.lockScreenDismissable = YES;
     }
+    
+    if (self.lockScreenDismissedByUser &&
+        [self.lastDriverDistractionNotification.state isEqualToEnum:SDLDriverDistractionStateOn] &&
+        !self.lockScreenDismissable) {
+        self.lockScreenDismissedByUser = NO;
+    }
 
     if (!self.lockScreenDismissedByUser) {
         [self sdl_updateLockscreenViewControllerWithDismissableState:self.lockScreenDismissable];