From 2e1311397f6f62515635191c86e82aca539a49fe Mon Sep 17 00:00:00 2001
From: "bzbarsky%mit.edu"
 <bzbarsky%mit.edu@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 1 Sep 2007 03:21:22 +0000
Subject: [PATCH] Revoke presentation restore events even if we just get a
 network stop.  Bug 306283, r+sr=biesi

git-svn-id: svn://10.0.0.236/trunk@233535 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/docshell/base/nsDocShell.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp
index 0a166bfc34b..fa2f62ecd4c 100644
--- a/mozilla/docshell/base/nsDocShell.cpp
+++ b/mozilla/docshell/base/nsDocShell.cpp
@@ -3223,10 +3223,10 @@ nsDocShell::Reload(PRUint32 aReloadFlags)
 NS_IMETHODIMP
 nsDocShell::Stop(PRUint32 aStopFlags)
 {
-    if (nsIWebNavigation::STOP_CONTENT & aStopFlags) {
-        // Revoke any pending event related to content viewer restoration
-        mRestorePresentationEvent.Revoke();
+    // Revoke any pending event related to content viewer restoration
+    mRestorePresentationEvent.Revoke();
 
+    if (nsIWebNavigation::STOP_CONTENT & aStopFlags) {
         // Stop the document loading
         if (mContentViewer)
             mContentViewer->Stop();