Bug 1401279 - Ensure that the menu itself is initialised as well when returning the menu panel. r=nechen
authorJan Henning <jh+bugzilla@buttercookie.de>
Tue, 19 Sep 2017 21:45:58 +0200
changeset 431581 1459712dc9cae49898e4aa2a89f4b6836c522946
parent 431580 83fdd1638d8e024167520b38deda513f6ce1d6cf
child 431582 6aa63fcf5c4ec13f9bef8ff21d9fea7a04d5436a
push id7785
push userryanvm@gmail.com
push dateThu, 21 Sep 2017 13:39:55 +0000
treeherdermozilla-beta@06d4034a8a03 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnechen
bugs1401279
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1401279 - Ensure that the menu itself is initialised as well when returning the menu panel. r=nechen MozReview-Commit-ID: 9FI7ebPJ16a
mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
--- a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
@@ -440,17 +440,17 @@ public abstract class GeckoApp extends G
     }
 
     @Override
     public MenuInflater getMenuInflater() {
         return new GeckoMenuInflater(this);
     }
 
     public MenuPanel getMenuPanel() {
-        if (mMenuPanel == null) {
+        if (mMenuPanel == null || mMenu == null) {
             onCreatePanelMenu(Window.FEATURE_OPTIONS_PANEL, null);
             invalidateOptionsMenu();
         }
         return mMenuPanel;
     }
 
     @Override
     public boolean onMenuItemClick(MenuItem item) {