From 72d67788945d456147edb4498154d231fa1482a6 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 26 Jun 2014 12:09:07 +0800
Subject: [PATCH] gtk: Make AppIndicator.SetContextMenu async, fixes #430.

---
 atom/browser/ui/gtk/app_indicator_icon.cc | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/atom/browser/ui/gtk/app_indicator_icon.cc b/atom/browser/ui/gtk/app_indicator_icon.cc
index 3b39ea0fc9a9..1c88b29065b8 100644
--- a/atom/browser/ui/gtk/app_indicator_icon.cc
+++ b/atom/browser/ui/gtk/app_indicator_icon.cc
@@ -173,8 +173,6 @@ AppIndicatorIcon::AppIndicatorIcon()
 AppIndicatorIcon::~AppIndicatorIcon() {
   if (icon_) {
     app_indicator_set_status(icon_, APP_INDICATOR_STATUS_PASSIVE);
-    // if (gtk_menu_)
-    //   DestroyMenu();
     g_object_unref(icon_);
     content::BrowserThread::GetBlockingPool()->PostTask(
         FROM_HERE,
@@ -220,6 +218,18 @@ void AppIndicatorIcon::SetToolTip(const std::string& tool_tip) {
 }
 
 void AppIndicatorIcon::SetContextMenu(ui::SimpleMenuModel* menu_model) {
+  // The icon is created asynchronously, wait until the icon has been ready.
+  if (!icon_) {
+    content::BrowserThread::GetBlockingPool()
+        ->GetTaskRunnerWithShutdownBehavior(
+              base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)->PostTask(
+        FROM_HERE,
+        base::Bind(&AppIndicatorIcon::SetContextMenu,
+                   weak_factory_.GetWeakPtr(),
+                   base::Unretained(menu_model)));
+    return;
+  }
+
   menu_.reset(new MenuGtk(NULL, menu_model));
   app_indicator_set_menu(icon_, GTK_MENU(menu_->widget()));
 }