1 files changed, 9 insertions, 4 deletions
diff --git a/application/palemoon/components/sessionstore/nsSessionStartup.js b/application/palemoon/components/sessionstore/nsSessionStartup.js
index 024246619..04037c10e 100644
--- a/application/palemoon/components/sessionstore/nsSessionStartup.js
+++ b/application/palemoon/components/sessionstore/nsSessionStartup.js
@@ -50,7 +50,7 @@ function debug(aMsg) {
   Services.console.logStringMessage(aMsg);
 }
 
-let gOnceInitializedDeferred = Promise.defer();
+var gOnceInitializedDeferred = Promise.defer();
 
 /* :::::::: The Service ::::::::::::::: */
 
@@ -77,9 +77,14 @@ SessionStartup.prototype = {
       return;
     }
 
-    _SessionFile.read().then(
-      this._onSessionFileRead.bind(this)
-    );
+    if (Services.prefs.getBoolPref("browser.sessionstore.resume_session_once") ||
+        Services.prefs.getIntPref("browser.startup.page") == 3) {
+      this._ensureInitialized();
+    } else {
+      _SessionFile.read().then(
+        this._onSessionFileRead.bind(this)
+      );
+    }
   },
 
   // Wrap a string as a nsISupports