Skip to content

Commit 8cae64f

Browse files
committed
fix(menu): crash on linux
- resolves #1477
1 parent 5cdc1bc commit 8cae64f

File tree

4 files changed

+3
-3
lines changed

4 files changed

+3
-3
lines changed

β€Žsrc/i18n/resources/@types/index.tsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export interface LanguageResources {
22
[lang: string]: {
33
translation: Record<string, unknown> & {
4-
language: {
4+
language?: {
55
name: string;
66
'local-name': string;
77
code: string;

β€Žsrc/index.tsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ async function createMainWindow() {
404404
removeContentSecurityPolicy();
405405

406406
win.webContents.on('dom-ready', async () => {
407-
if (useInlineMenu) {
407+
if (useInlineMenu && !is.linux()) {
408408
win.setTitleBarOverlay({
409409
...defaultTitleBarOverlayOptions,
410410
height: Math.floor(

β€Žsrc/menu.tsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ export const mainMenuTemplate = async (
377377
availableLanguages
378378
.map(
379379
(lang): Electron.MenuItemConstructorOptions => ({
380-
label: `${languageResources[lang].translation.language.name} (${languageResources[lang].translation.language['local-name']})`,
380+
label: `${languageResources[lang].translation.language?.name ?? 'Unknown'} (${languageResources[lang].translation.language?.['local-name'] ?? 'Unknown'})`,
381381
type: 'checkbox',
382382
checked: (config.get('options.language') ?? 'en') === lang,
383383
click() {

0 commit comments

Comments
Β (0)