From 058be7e89565b7bbefcbc729fb1f2152bae6c700 Mon Sep 17 00:00:00 2001
From: Addison Beck <abeck@bitwarden.com>
Date: Wed, 26 Jan 2022 12:32:00 -0500
Subject: [PATCH] [bug] Disable the preferences screen if there is no active
 unlocked vault (#1270)

---
 src/main/menu.bitwarden.ts | 6 +++++-
 src/main/menubar.ts        | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/menu.bitwarden.ts b/src/main/menu.bitwarden.ts
index e5a1cfbc..d2343908 100644
--- a/src/main/menu.bitwarden.ts
+++ b/src/main/menu.bitwarden.ts
@@ -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,
     };
   }
 
diff --git a/src/main/menubar.ts b/src/main/menubar.ts
index f5c4d976..6f517652 100644
--- a/src/main/menubar.ts
+++ b/src/main/menubar.ts
@@ -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),