Only capture screenshots if the first paint is ready (#2304)

MozillaReality · Nov 18, 2019 · 6f898f0 · 6f898f0
1 parent 2333f6e
commit 6f898f0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java
@@ -978,7 +978,7 @@ public void setFirstDrawCallback(Runnable aRunnable) {
 
     @Override
     public boolean isFirstPaintReady() {
-        return mWidgetPlacement.composited;
+        return mWidgetPlacement != null && mWidgetPlacement.composited;
     }
 
     @Override
@@ -1536,7 +1536,9 @@ public void onPageStart(@NonNull GeckoSession geckoSession, @NonNull String s) {
     public void onPageStop(@NonNull GeckoSession aSession, boolean b) {
         if (mCaptureOnPageStop || !mSession.hasCapturedBitmap()) {
             mCaptureOnPageStop = false;
-            captureImage();
+            if (isFirstPaintReady()) {
+                captureImage();
+            }
         }
     }
 

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
@@ -973,7 +973,9 @@ public void onTabsClicked() {
 
         // Capture active session snapshots when showing the tabs menu
         for (WindowWidget window: getCurrentWindows()) {
-            window.captureImage();
+            if (window.isFirstPaintReady()) {
+                window.captureImage();
+            }
         }
     }