Revoke presentation restore events even if we just get a network stop. Bug 306283, r+sr=biesi

2007-08-31 20:21:22 -07:00
parent 5fbc6c144a
commit 2fc684b1e1
1 changed files with 3 additions and 3 deletions
--- a/docshell/base/nsDocShell.cpp
+++ b/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();