From e4b83e36cc1633752c4989a987534736c64f75b9 Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Tue, 11 Mar 2014 23:01:22 -0700
Subject: [PATCH] Bug 968182 - Hide the Android menu before reshowing it with a
 submenu. r=lucasr

---
 mobile/android/base/GeckoApp.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mobile/android/base/GeckoApp.java b/mobile/android/base/GeckoApp.java
index 171db7fbf77c..1389b5df1dc1 100644
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -370,9 +370,9 @@ public abstract class GeckoApp
 
     @Override
     public void showMenu(View menu) {
-        // Hide the menu only if we are showing the MenuPopup.
-        if (!HardwareUtils.hasMenuButton())
-            closeMenu();
+        // Hide the menu before we reshow it to avoid platform specific bugs like
+        // bug 794581 and bug 968182.
+        closeMenu();
 
         mMenuPanel.removeAllViews();
         mMenuPanel.addView(menu);