Bug 888381: NPE on closeOptionsMenu() in BrowerToolbar. [r=mfinkle]

--HG--
extra : rebase_source : f779107a2893ae2d40113bc67f461adc0fa6767b
This commit is contained in:
Sriram Ramasubramanian 2013-06-28 11:19:06 -07:00
parent fc86fbdc7e
commit a56afe2ca3

View File

@ -1192,7 +1192,7 @@ public class BrowserToolbar extends GeckoRelativeLayout
if (!mHasSoftMenuButton)
return false;
if (mMenuPopup.isShowing())
if (mMenuPopup != null && mMenuPopup.isShowing())
mMenuPopup.dismiss();
return true;