From 175a41f2757651ac982939fd0615564bedba81f5 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Wed, 27 Dec 2017 17:05:33 -0500
Subject: [PATCH] logic adjustments for first lock check

---
 src/App/Services/LockService.cs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/App/Services/LockService.cs b/src/App/Services/LockService.cs
index 700cb36e1..8668ba077 100644
--- a/src/App/Services/LockService.cs
+++ b/src/App/Services/LockService.cs
@@ -46,10 +46,6 @@ namespace Bit.App.Services
 
         public async Task<LockType> GetLockTypeAsync(bool forceLock)
         {
-            // Always locked if not already running in memory.
-            var firstlockCheck = _firstLockCheck;
-            _firstLockCheck = false;
-
             // Only lock if they are logged in
             if(!_authService.IsAuthenticated)
             {
@@ -60,7 +56,7 @@ namespace Bit.App.Services
             var lockSeconds = _settings.GetValueOrDefault(Constants.SettingLockSeconds, 60 * 15);
 
             // Are we forcing a lock? (i.e. clicking a button to lock the app manually, immediately)
-            if(!firstlockCheck && !forceLock && !_appSettings.Locked)
+            if(!_firstLockCheck && !forceLock && !_appSettings.Locked)
             {
                 if(lockSeconds == -1)
                 {
@@ -76,7 +72,7 @@ namespace Bit.App.Services
             }
 
             // Skip first lock check if not using locking
-            if(firstlockCheck && lockSeconds == -1 && !forceLock && !_appSettings.Locked)
+            if(_firstLockCheck && lockSeconds == -1 && !forceLock && !_appSettings.Locked)
             {
                 return LockType.None;
             }
@@ -104,10 +100,12 @@ namespace Bit.App.Services
             if(TopPageIsLock())
             {
                 // already locked
+                _firstLockCheck = false;
                 return;
             }
 
             var lockType = await GetLockTypeAsync(forceLock);
+            _firstLockCheck = false;
             if(lockType == LockType.None)
             {
                 return;