Prevent duplicated setActive(false) calls (#3376)

MozillaReality · May 14, 2020 · 9b9d7c6 · 9b9d7c6
1 parent ff61feb
commit 9b9d7c6
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/Session.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/Session.java
@@ -767,6 +767,12 @@ public void goForward() {
     }
 
     public void setActive(boolean aActive) {
+        if (!aActive && mState.mSession != null && !mState.isActive()) {
+            // Prevent duplicated setActive(false) calls. There is a GV
+            // bug that makes the session not to be resumed correctly.
+            // See https://github.com/MozillaReality/FirefoxReality/issues/3375.
+            return;
+        }
         // Flush the events queued while the session was inactive
         if (mState.mSession != null && !mState.isActive() && aActive) {
             flushQueuedEvents();