From ab5e7b5bd9b58fb4b5c298790f2734383af55f23 Mon Sep 17 00:00:00 2001
From: Mike Sawka <mike@commandline.dev>
Date: Wed, 11 Dec 2024 10:48:50 -0800
Subject: [PATCH] add try/catch around workspace menu (#1492)

---
 emain/menu.ts | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/emain/menu.ts b/emain/menu.ts
index 0d73d1d41..1bf125982 100644
--- a/emain/menu.ts
+++ b/emain/menu.ts
@@ -272,9 +272,12 @@ async function getAppMenu(callbacks: AppMenuCallbacks, workspaceId?: string): Pr
             role: "togglefullscreen",
         },
     ];
-
-    const workspaceMenu = await getWorkspaceMenu();
-
+    let workspaceMenu: Electron.MenuItemConstructorOptions[] = null;
+    try {
+        workspaceMenu = await getWorkspaceMenu();
+    } catch (e) {
+        console.error("getWorkspaceMenu error:", e);
+    }
     const windowMenu: Electron.MenuItemConstructorOptions[] = [
         { role: "minimize", accelerator: "" },
         { role: "zoom" },
@@ -300,16 +303,18 @@ async function getAppMenu(callbacks: AppMenuCallbacks, workspaceId?: string): Pr
             role: "viewMenu",
             submenu: viewMenu,
         },
-        {
+    ];
+    if (workspaceMenu != null) {
+        menuTemplate.push({
             label: "Workspace",
             id: "workspace-menu",
             submenu: workspaceMenu,
-        },
-        {
-            role: "windowMenu",
-            submenu: windowMenu,
-        },
-    ];
+        });
+    }
+    menuTemplate.push({
+        role: "windowMenu",
+        submenu: windowMenu,
+    });
     return electron.Menu.buildFromTemplate(menuTemplate);
 }