Added check to avoid the nullpointerexception

MozillaReality · Dec 16, 2019 · 983720e · 983720e
1 parent 6ba3881
commit 983720e
Showing 1 changed file with 2 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
@@ -373,10 +373,10 @@ public void moveWindowLeft(@NonNull WindowWidget aWindow) {
     }
 
     public void focusWindow(@NonNull WindowWidget aWindow) {
-        if (aWindow != mFocusedWindow) {
+        if (mFocusedWindow != null && aWindow != mFocusedWindow) {
             WindowWidget prev = mFocusedWindow;
             mFocusedWindow = aWindow;
-            if (prev != null && getCurrentWindows().contains(prev)) {
+            if (getCurrentWindows().contains(prev)) {
                 prev.setActiveWindow(false);
                 if (prev.isVisible()) {
                     prev.getTitleBar().setVisible(true);