Make sure widget manager is not null in MenuWidget.hide() (#3104)

Fixes #3092
MozillaReality · Apr 7, 2020 · 9378a63 · 9378a63
1 parent c2fa4f7
commit 9378a63
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/menus/MenuWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/menus/MenuWidget.java
@@ -65,14 +65,18 @@ public void updateUI() {
     public void show(@ShowFlags int aShowFlags) {
         super.show(aShowFlags);
 
-        mWidgetManager.addFocusChangeListener(this);
+        if (mWidgetManager != null) {
+            mWidgetManager.addFocusChangeListener(this);
+        }
     }
 
     @Override
     public void hide(@HideFlags int aHideFlags) {
         super.hide(aHideFlags);
 
-        mWidgetManager.removeFocusChangeListener(this);
+        if (mWidgetManager != null) {
+            mWidgetManager.removeFocusChangeListener(this);
+        }
     }
 
     public void updateMenuItems(ArrayList<MenuItem> aItems) {