Fix Oculus layers array stack overflow (#1764)

* Fix Oculus layers array stack overflow * It's preferable to hide the windows first to avoid max layers race conditions
MozillaReality · Sep 4, 2019 · 66a6788 · 66a6788
1 parent 63542e4
commit 66a6788
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 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
@@ -487,12 +487,12 @@ public void exitPrivateMode() {
         } else {
             mPrivateWindowPlacement = WindowPlacement.FRONT;
         }
-        for (WindowWidget window: mRegularWindows) {
-            setWindowVisible(window, true);
-        }
         for (WindowWidget window: mPrivateWindows) {
             setWindowVisible(window, false);
         }
+        for (WindowWidget window: mRegularWindows) {
+            setWindowVisible(window, true);
+        }
         focusWindow(getWindowWithPlacement(mRegularWindowPlacement));
         updateViews();
         mWidgetManager.popWorldBrightness(this);

diff --git a/app/src/oculusvr/cpp/DeviceDelegateOculusVR.cpp b/app/src/oculusvr/cpp/DeviceDelegateOculusVR.cpp
@@ -1454,7 +1454,7 @@ DeviceDelegateOculusVR::EndFrame(const bool aDiscard) {
 
   // Draw back layers
   for (const OculusLayerPtr& layer: m.uiLayers) {
-    if (!layer->GetDrawInFront() && layer->IsDrawRequested() && layerCount < ovrMaxLayerCount) {
+    if (!layer->GetDrawInFront() && layer->IsDrawRequested() && (layerCount < ovrMaxLayerCount - 1)) {
       layer->Update(m.predictedTracking);
       layers[layerCount++] = layer->Header();
       layer->ClearRequestDraw();