Correctly focus front window after another is closed (#2640)

keianhzo · bluemarvin · commit 3177b95ecdae · 2020-01-14T11:12:00.000-08:00
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
@@ -307,9 +307,8 @@ public void closeWindow(@NonNull WindowWidget aWindow) {
                 placeWindow(leftWindow, WindowPlacement.FRONT);
             }
 
-            frontWindow = getFrontWindow();
-            if (mFocusedWindow == frontWindow && !getCurrentWindows().isEmpty() && frontWindow != null) {
-                focusWindow(frontWindow);
+            if (mFocusedWindow == frontWindow && !getCurrentWindows().isEmpty() && getFrontWindow() != null) {
+                focusWindow(getFrontWindow());
             }
 
         }

Original file line number	Diff line number	Diff line change
`@@ -307,9 +307,8 @@ public void closeWindow(@NonNull WindowWidget aWindow) {`
`307`	`307`	`placeWindow(leftWindow, WindowPlacement.FRONT);`
`308`	`308`	`}`
`309`	`309`
`310`		`- frontWindow = getFrontWindow();`
`311`		`- if (mFocusedWindow == frontWindow && !getCurrentWindows().isEmpty() && frontWindow != null) {`
`312`		`- focusWindow(frontWindow);`
	`310`	`+ if (mFocusedWindow == frontWindow && !getCurrentWindows().isEmpty() && getFrontWindow() != null) {`
	`311`	`+ focusWindow(getFrontWindow());`
`313`	`312`	`}`
`314`	`313`
`315`	`314`	`}`