Elgato_dark/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm synced 2026-05-24 09:18:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add try/catch around workspace menu (#1492)

Browse source
This commit is contained in:
Mike Sawka 2024-12-11 10:48:50 -08:00 committed by GitHub
parent 448262c17f
commit ab5e7b5bd9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
emain/menu.ts
View file

@ -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);
}