Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-27 12:36:14 +01:00
Code Issues Projects Releases Wiki Activity

[bug] Disable the preferences screen if there is no active unlocked vault (#1270)

Browse Source
This commit is contained in:
Addison Beck 2022-01-26 12:32:00 -05:00 committed by GitHub
parent ff7dd4ad8f
commit 058be7e895
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/menu.bitwarden.ts
View File

@ -50,19 +50,22 @@ export class BitwardenMenu implements IMenubarMenu {
private readonly _messagingService: MessagingService;
private readonly _accounts: { [userId: string]: MenuAccount };
private readonly _window: BrowserWindow;
private readonly _isLocked: boolean;
constructor(
i18nService: I18nService,
messagingService: MessagingService,
updater: UpdaterMain,
window: BrowserWindow,
accounts: { [userId: string]: MenuAccount }
accounts: { [userId: string]: MenuAccount },
isLocked: boolean
) {
this._i18nService = i18nService;
this._updater = updater;
this._messagingService = messagingService;
this._window = window;
this._accounts = accounts;
this._isLocked = isLocked;
}
private get hasAccounts(): boolean {
@ -99,6 +102,7 @@ export class BitwardenMenu implements IMenubarMenu {
label: this.localize(process.platform === "darwin" ? "preferences" : "settings"),
click: () => this.sendMessage("openSettings"),
accelerator: "CmdOrCtrl+,",
enabled: !this._isLocked,
};
}

3
src/main/menubar.ts
View File

@ -67,7 +67,8 @@ export class Menubar {
messagingService,
updaterMain,
windowMain.win,
updateRequest?.accounts
updateRequest?.accounts,
isLocked
),
new FileMenu(i18nService, messagingService, isLocked),
new EditMenu(i18nService, messagingService, isLocked),