From 84b6bbe25e2773ddc5f6fc23efb4e55df5430d4a Mon Sep 17 00:00:00 2001
From: Stefan Aebischer <aebischer@pixtron.ch>
Date: Mon, 17 Feb 2020 13:23:01 -0500
Subject: [PATCH] Fix TypeError: Cannot read property 'setContextMenu' of
 undefined

Fixes regression introduced with a1c72b5
Related to: #207
---
 CHANGELOG.md              | 1 +
 app/ui/tray/controller.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f515628..1fbcf03 100644
--- 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
index 59be5bc..6a1910c 100644
--- 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)