Fix TypeError: Cannot read property 'setContextMenu' of undefined

pixtron · pixtron · commit 84b6bbe25e27 · 2020-02-17T13:23:01.000-05:00
Fixes regression introduced with a1c72b5 Related to: #207
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@
 * New tray behaviour for linux #207
 * Improve sync error messages displayed to users #216
 
+
 ## 1.2.1
 **Maintainer**: balloon-team <opensource@gyselroth.net>\
 **Date**: Thu Jan 09 10:44:43 CET 2020
diff --git a/app/ui/tray/controller.js b/app/ui/tray/controller.js
@@ -320,7 +320,7 @@ module.exports = function(env, clientConfig) {
   }
 
   function updateTrayMenu() {
-    if (TRAY_CLICK_SHOW_WINDOW) return;
+    if (TRAY_CLICK_SHOW_WINDOW || !tray) return;
 
     const menu = menuFactory(loadMenu, clientConfig, showLogin, syncStatus)
 

Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,7 @@ module.exports = function(env, clientConfig) {`
`320`	`320`	`}`
`321`	`321`
`322`	`322`	`function updateTrayMenu() {`
`323`		`- if (TRAY_CLICK_SHOW_WINDOW) return;`
	`323`	`+ if (TRAY_CLICK_SHOW_WINDOW \|\| !tray) return;`
`324`	`324`
`325`	`325`	`const menu = menuFactory(loadMenu, clientConfig, showLogin, syncStatus)`
`326`	`326`