From b3c56428fa8fe15a35b70c5f5ca933ce2c0bba66 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Fri, 29 Nov 2019 19:41:09 +0700 Subject: Prevent Password Lock to trigger while not logged in --- src/lib/Menu.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/Menu.js') diff --git a/src/lib/Menu.js b/src/lib/Menu.js index 941107adb..303845e55 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js @@ -800,7 +800,7 @@ export default class FranzMenu { }, { label: intl.formatMessage(menuItems.lockFerdi), accelerator: 'CmdOrCtrl+Shift+L', - enabled: this.stores.settings.app.lockingFeatureEnabled, + enabled: this.stores.user.isLoggedIn && this.stores.settings.app.lockingFeatureEnabled, click() { // Disable lock first - otherwise the application might not update correctly actions.settings.update({ @@ -964,7 +964,7 @@ export default class FranzMenu { this.currentTemplate = tpl; const menu = Menu.buildFromTemplate(tpl); const lockedMenu = Menu.buildFromTemplate([]); - Menu.setApplicationMenu(this.stores.settings.app.locked ? lockedMenu : menu); + Menu.setApplicationMenu(this.stores.user.isLoggedIn && this.stores.settings.app.locked ? lockedMenu : menu); } serviceTpl() { -- cgit v1.2.3-54-g00ecf