From eeac6d3610ad3d260a9fec69031fb0f55646f4aa Mon Sep 17 00:00:00 2001
From: Johnathan Nightingale <johnath@mozilla.com>
Date: Wed, 20 May 2009 09:27:25 -0400
Subject: [PATCH] Don't clear session when "clear on shutdown" is set if we're
 actually just doing a restart. b=487219 r=zeniko

---
 browser/components/sessionstore/src/nsSessionStore.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/browser/components/sessionstore/src/nsSessionStore.js b/browser/components/sessionstore/src/nsSessionStore.js
index d3220eb98fe..2c100a8a818 100644
--- a/browser/components/sessionstore/src/nsSessionStore.js
+++ b/browser/components/sessionstore/src/nsSessionStore.js
@@ -326,8 +326,10 @@ SessionStoreService.prototype = {
       this._loadState = STATE_QUITTING;
       break;
     case "quit-application":
-      if (aData == "restart")
+      if (aData == "restart") {
         this._prefBranch.setBoolPref("sessionstore.resume_session_once", true);
+        this._clearingOnShutdown = false;
+      }
       this._loadState = STATE_QUITTING; // just to be sure
       this._uninit();
       break;