From 4afc2373f0e38f3e0eb054027ec42abfb6e4487d Mon Sep 17 00:00:00 2001
From: Blake Kaplan <mrbkap@gmail.com>
Date: Thu, 12 Aug 2010 21:05:05 -0700
Subject: [PATCH] Bug 583200 - Don't assert things about SHEntries if session
 history is disabled.

---
 docshell/base/nsDocShell.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 6232babf443..bc17cfb77a7 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -9045,7 +9045,7 @@ nsDocShell::OnNewURI(nsIURI * aURI, nsIChannel * aChannel, nsISupports* aOwner,
            ("  shAvailable=%i updateHistory=%i equalURI=%i\n",
             shAvailable, updateHistory, equalUri));
 
-    if (mCurrentURI && !mOSHE && aLoadType != LOAD_ERROR_PAGE) {
+    if (shAvailable && mCurrentURI && !mOSHE && aLoadType != LOAD_ERROR_PAGE) {
         NS_ASSERTION(IsAboutBlank(mCurrentURI), "no SHEntry for a non-transient viewer?");
     }
 #endif