diff options
| author |  Amine Mouafik <amine@mouafik.fr> | 2019-11-29 19:41:09 +0700 |
|---|---|---|
| committer | Amine Mouafik <amine@mouafik.fr> | 2019-11-29 19:41:09 +0700 |
| commit | b3c56428fa8fe15a35b70c5f5ca933ce2c0bba66 (patch) | |
| tree | 982c30316842530af2f162fca0e5aaba96279b87 /src/lib | |
| parent | Fix cannot read property 'args' of null (diff) | |
| download | ferdium-app-b3c56428fa8fe15a35b70c5f5ca933ce2c0bba66.tar.gz ferdium-app-b3c56428fa8fe15a35b70c5f5ca933ce2c0bba66.tar.zst ferdium-app-b3c56428fa8fe15a35b70c5f5ca933ce2c0bba66.zip | |
Prevent Password Lock to trigger while not logged in
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/Menu.js | 4 |
1 files changed, 2 insertions, 2 deletions
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 { | |||
| 800 | }, { | 800 | }, { |
| 801 | label: intl.formatMessage(menuItems.lockFerdi), | 801 | label: intl.formatMessage(menuItems.lockFerdi), |
| 802 | accelerator: 'CmdOrCtrl+Shift+L', | 802 | accelerator: 'CmdOrCtrl+Shift+L', |
| 803 | enabled: this.stores.settings.app.lockingFeatureEnabled, | 803 | enabled: this.stores.user.isLoggedIn && this.stores.settings.app.lockingFeatureEnabled, |
| 804 | click() { | 804 | click() { |
| 805 | // Disable lock first - otherwise the application might not update correctly | 805 | // Disable lock first - otherwise the application might not update correctly |
| 806 | actions.settings.update({ | 806 | actions.settings.update({ |
| @@ -964,7 +964,7 @@ export default class FranzMenu { | |||
| 964 | this.currentTemplate = tpl; | 964 | this.currentTemplate = tpl; |
| 965 | const menu = Menu.buildFromTemplate(tpl); | 965 | const menu = Menu.buildFromTemplate(tpl); |
| 966 | const lockedMenu = Menu.buildFromTemplate([]); | 966 | const lockedMenu = Menu.buildFromTemplate([]); |
| 967 | Menu.setApplicationMenu(this.stores.settings.app.locked ? lockedMenu : menu); | 967 | Menu.setApplicationMenu(this.stores.user.isLoggedIn && this.stores.settings.app.locked ? lockedMenu : menu); |
| 968 | } | 968 | } |
| 969 | 969 | ||
| 970 | serviceTpl() { | 970 | serviceTpl() { |