Fix panel restore on restart. (#3164)

MozillaReality · Apr 16, 2020 · 8ae349f · 8ae349f
1 parent 0c87393
commit 8ae349f
Showing 1 changed file with 5 additions and 8 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
@@ -545,21 +545,18 @@ private void showPanel(@NonNull Windows.PanelType panelType, boolean switchSurfa
             setView(libraryView, switchSurface);
             libraryView.onShow();
             mViewModel.setIsPanelVisible(panelType, true);
-            if (mRestoreFirstPaint == null && !isFirstPaintReady() && (mFirstDrawCallback != null)) {
+            if (mRestoreFirstPaint == null && !isFirstPaintReady() && (mFirstDrawCallback != null) && (mSurface != null)) {
+                final Runnable firstDrawCallback = mFirstDrawCallback;
                 onFirstContentfulPaint(mSession.getGeckoSession());
                 mRestoreFirstPaint = () -> {
                     setFirstPaintReady(false);
-                    setFirstDrawCallback(() -> {
-                        setFirstPaintReady(true);
-                        if (mWidgetManager != null) {
-                            mWidgetManager.updateWidget(WindowWidget.this);
-                        }
-                    });
+                    setFirstDrawCallback(firstDrawCallback);
                     if (mWidgetManager != null) {
                         mWidgetManager.updateWidget(WindowWidget.this);
                     }
                 };
             }
+
         }
     }
 
@@ -575,7 +572,7 @@ public void hidePanel(@NonNull Windows.PanelType panelType, boolean switchSurfac
             mViewModel.setIsPanelVisible(panelType, false);
         }
         if (switchSurface && mRestoreFirstPaint != null) {
-            mUIThreadExecutor.execute(mRestoreFirstPaint);
+            mRestoreFirstPaint.run();
             mRestoreFirstPaint = null;
         }
     }