fix(Desktop): Fix crash on non Mac operating systems

close #1059
stencila · Aug 3, 2021 · 008adc1 · 008adc1
1 parent bea03bb
commit 008adc1
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 33 deletions.
diff --git a/desktop/src/main/menu/app.ts b/desktop/src/main/menu/app.ts
@@ -3,28 +3,30 @@ import { showSettings } from '../config/window'
 import { checkForUpdates } from '../utils/update'
 import { isMac } from './utils'
 
-export const baseAppMenu: MenuItemConstructorOptions = isMac
-  ? {
-      label: app.name,
-      submenu: [
-        { role: 'about' as const },
-        { label: 'Check For Updates…', click: checkForUpdates },
-        { type: 'separator' as const },
-        {
-          label: 'Preferences…',
-          accelerator: 'CommandOrControl+,',
-          click: () => {
-            showSettings()
+export const baseAppMenu: MenuItemConstructorOptions[] = isMac
+  ? [
+      {
+        label: app.name,
+        submenu: [
+          { role: 'about' as const },
+          { label: 'Check For Updates…', click: checkForUpdates },
+          { type: 'separator' as const },
+          {
+            label: 'Preferences…',
+            accelerator: 'CommandOrControl+,',
+            click: () => {
+              showSettings()
+            },
           },
-        },
-        { type: 'separator' as const },
-        { role: 'services' as const },
-        { type: 'separator' as const },
-        { role: 'hide' as const },
-        { role: 'hideOthers' as const },
-        { role: 'unhide' as const },
-        { type: 'separator' as const },
-        { role: 'quit' as const },
-      ],
-    }
-  : {}
+          { type: 'separator' as const },
+          { role: 'services' as const },
+          { type: 'separator' as const },
+          { role: 'hide' as const },
+          { role: 'hideOthers' as const },
+          { role: 'unhide' as const },
+          { type: 'separator' as const },
+          { role: 'quit' as const },
+        ],
+      },
+    ]
+  : []
diff --git a/desktop/src/main/menu/help.ts b/desktop/src/main/menu/help.ts
@@ -1,7 +1,7 @@
 import { MenuItemConstructorOptions } from 'electron'
 import { openOnboardingWindow } from '../onboarding/window'
 import { checkForUpdates } from '../utils/update'
-import { isMac } from './utils'
+import { isMac, isWindows } from './utils'
 
 export const baseHelpMenu: MenuItemConstructorOptions = {
   role: 'help',
@@ -33,12 +33,16 @@ export const baseHelpMenu: MenuItemConstructorOptions = {
       },
     },
     { type: 'separator' },
-    {
-      label: 'Check for Updates…',
-      click: () => {
-        checkForUpdates()
-      },
-    },
+    ...(isMac || isWindows
+      ? [
+          {
+            label: 'Check for Updates…',
+            click: () => {
+              checkForUpdates()
+            },
+          },
+        ]
+      : []),
     {
       label: 'Setup…',
       click: openOnboardingWindow,

diff --git a/desktop/src/main/menu/index.ts b/desktop/src/main/menu/index.ts
@@ -6,7 +6,7 @@ import { baseViewMenu } from './view'
 import { baseWindowMenu } from './window'
 
 const template: (MenuItemConstructorOptions | MenuItem)[] = [
-  baseAppMenu,
+  ...baseAppMenu,
   baseFileMenu,
   baseViewMenu,
   baseWindowMenu,

diff --git a/desktop/src/main/project/menu/index.ts b/desktop/src/main/project/menu/index.ts
@@ -8,7 +8,7 @@ import { projectEditorMenu } from './editor'
 import { projectFileMenu } from './file'
 
 const template: (MenuItemConstructorOptions | MenuItem)[] = [
-  baseAppMenu,
+  ...baseAppMenu,
   projectFileMenu,
   projectEditMenu,
   baseViewMenu,