Null check focused window when entering/exiting private mode (#1763)

MozillaReality · Sep 4, 2019 · 4fdf7f5 · 4fdf7f5
1 parent d8d8d20
commit 4fdf7f5
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java
@@ -407,7 +407,12 @@ public void enterPrivateMode() {
         }
         mPrivateMode = true;
         updateCurvedMode(true);
-        mRegularWindowPlacement = mFocusedWindow.getWindowPlacement();
+        if (mFocusedWindow != null) {
+            mRegularWindowPlacement = mFocusedWindow.getWindowPlacement();
+
+        } else {
+            mRegularWindowPlacement = WindowPlacement.FRONT;
+        }
         for (WindowWidget window: mRegularWindows) {
             setWindowVisible(window, false);
         }
@@ -434,7 +439,12 @@ public void exitPrivateMode() {
         }
         mPrivateMode = false;
         updateCurvedMode(true);
-        mPrivateWindowPlacement = mFocusedWindow.getWindowPlacement();
+        if (mFocusedWindow != null) {
+            mPrivateWindowPlacement = mFocusedWindow.getWindowPlacement();
+
+        } else {
+            mPrivateWindowPlacement = WindowPlacement.FRONT;
+        }
         for (WindowWidget window: mRegularWindows) {
             setWindowVisible(window, true);
         }