From 613e5c77ea8386f37b8c6c3a89cbac7ed66936aa Mon Sep 17 00:00:00 2001
From: Haojian Wu <hokein.wu@gmail.com>
Date: Tue, 4 Aug 2015 19:45:44 +0800
Subject: [PATCH] Check context menu when calling popContextMenu API.

---
 atom/browser/ui/win/notify_icon.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/atom/browser/ui/win/notify_icon.cc b/atom/browser/ui/win/notify_icon.cc
index fd9a90ae1d5d..962dc871b5b6 100644
--- a/atom/browser/ui/win/notify_icon.cc
+++ b/atom/browser/ui/win/notify_icon.cc
@@ -162,6 +162,9 @@ void NotifyIcon::DisplayBalloon(const gfx::Image& icon,
 }
 
 void NotifyIcon::PopContextMenu(const gfx::Point& pos) {
+  // Returns if context menu isn't set.
+  if (!menu_model_)
+    return;
   // Set our window as the foreground window, so the context menu closes when
   // we click away from it.
   if (!SetForegroundWindow(window_))