Fix crash restoring sessions (#1497)

MozillaReality · Aug 5, 2019 · b4fe813 · b4fe813
1 parent 2121712
commit b4fe813
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionStack.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionStack.java
@@ -291,7 +291,9 @@ public void restore(SessionStack store, int currentSessionId) {
                 state.mSession = new GeckoSession(geckoSettings);
             }
 
-            state.mSession.restoreState(state.mSessionState);
+            if (state.mSessionState != null) {
+                state.mSession.restoreState(state.mSessionState);
+            }
 
             int newSessionId = state.mSession.hashCode();
             oldNewSessionId.put(entry.getKey(), newSessionId);