From e44b0f60d44215c1cb8a11ba8478664cb9073798 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Thu, 14 Oct 2010 18:31:59 -0400
Subject: [PATCH] Don't run the sanitizer at shutdown unasked.

---
 common/modules/sanitizer.jsm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/modules/sanitizer.jsm b/common/modules/sanitizer.jsm
index 6b600872..a32eccdc 100644
--- a/common/modules/sanitizer.jsm
+++ b/common/modules/sanitizer.jsm
@@ -242,7 +242,7 @@ const Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakR
                 this.sanitizeItems(null, Range(this.sessionStart), null, "sessionHistory");
         },
         "quit-application-granted": function (subject, data) {
-            if (!this.sanitizeItems(null, Range(), null, "shutdown"))
+            if (this.runAtShutdown && !this.sanitizeItems(null, Range(), null, "shutdown"))
                 this.ranAtShutdown = true;
         },
         "private-browsing": function (subject, data) {