From eda54bbf7707d42ef0c9ebcf71d31bd1003da159 Mon Sep 17 00:00:00 2001
From: Sadetdin EYILI <sad270@users.noreply.github.com>
Date: Sun, 5 Sep 2021 01:29:23 +0200
Subject: fix: ferdi locking with lock feature disabled (#1866)

Set run the inactivity timeout only if lock feature is enabled, and use same condition between lock
screen and locked menu

fix #1862
---
 src/stores/SettingsStore.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/stores/SettingsStore.js')

diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index f551e1e49..9aade974c 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -65,7 +65,7 @@ export default class SettingsStore extends Store {
     // Inactivity lock timer
     let inactivityTimer;
     getCurrentWindow().on('blur', () => {
-      if (this.all.app.inactivityLock !== 0) {
+      if (this.all.app.lockingFeatureEnabled && this.all.app.inactivityLock !== 0) {
         inactivityTimer = setTimeout(() => {
           this.actions.settings.update({
             type: 'app',
-- 
cgit v1.2.3-54-g00ecf