From 689e7a49998054da04a43e336c85ad3d7e0d6201 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 29 May 2018 23:11:28 -0400
Subject: [PATCH] null checks on contextMenu

---
 src/main/messaging.main.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/messaging.main.ts b/src/main/messaging.main.ts
index 695fbcc5622..8a6e2546563 100644
--- a/src/main/messaging.main.ts
+++ b/src/main/messaging.main.ts
@@ -54,6 +54,9 @@ export class MessagingMain {
     }
 
     private updateTrayMenu(isAuthenticated: boolean, isLocked: boolean) {
+        if (this.main.trayMain == null || this.main.trayMain.contextMenu == null) {
+            return;
+        }
         const lockNowTrayMenuItem = this.main.trayMain.contextMenu.getMenuItemById('lockNow');
         if (lockNowTrayMenuItem != null) {
             lockNowTrayMenuItem.enabled = isAuthenticated && !isLocked;