quick fix

1 files changed, 7 insertions, 2 deletions

diff --git a/SmartDeviceLink/private/SDLLockScreenManager.m b/SmartDeviceLink/private/SDLLockScreenManager.m
index b5d0cddde..1924b8b5a 100644
--- a/SmartDeviceLink/private/SDLLockScreenManager.m
+++ b/SmartDeviceLink/private/SDLLockScreenManager.m
@@ -165,8 +165,13 @@ NS_ASSUME_NONNULL_BEGIN
     if (![notification isNotificationMemberOfClass:[SDLOnDriverDistraction class]]) {
         return;
     }
-
-    self.lastDriverDistractionNotification = notification.notification;
+    // currentDriverDistraction variable is introduced to insure that unless the lockScreenDismissalEnabled value changes, it should stay what it was last set to
+    SDLOnDriverDistraction *currentDriverDistraction = notification.notification;
+    if (currentDriver.lockScreenDismissalEnabled == nil && self.lastDriverDistractionNotification.lockScreenDismissalEnabled != nil){
+        currentDriverDistraction.lockScreenDismissalEnabled = self.lastDriverDistractionNotification.lockScreenDismissalEnabled;
+        currentDriverDistraction.lockScreenDismissalWarning = self.lastDriverDistractionNotification.lockScreenDismissalWarning;
+    }
+    self.lastDriverDistractionNotification = currentDriverDistraction;
     [self sdl_updateLockScreenDismissable];
 }