From d7cd28c72a6c9d314ae5589d94de2eabe8b60280 Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Tue, 15 Feb 2011 13:41:38 +0200
Subject: [PATCH] Bug 633413, don't bfcache so often, part 2, r=bz, a=blocker

--HG--
extra : rebase_source : 434c40c52237a3f6b35916288579ab6572e702ff
---
 docshell/base/nsDocShell.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 63626abaf4c0..6a9597ee33a2 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -6565,6 +6565,13 @@ nsDocShell::CanSavePresentation(PRUint32 aLoadType,
     if (!mOSHE)
         return PR_FALSE; // no entry to save into
 
+    nsCOMPtr<nsIContentViewer> viewer;
+    mOSHE->GetContentViewer(getter_AddRefs(viewer));
+    if (viewer) {
+        NS_WARNING("mOSHE already has a content viewer!");
+        return PR_FALSE;
+    }
+
     // Only save presentation for "normal" loads and link loads.  Anything else
     // probably wants to refetch the page, so caching the old presentation
     // would be incorrect.