From fba1c662d560e47a0e0b49aa4e4dcbb8c74f3132 Mon Sep 17 00:00:00 2001 From: "rpotts%netscape.com" Date: Fri, 5 Nov 1999 20:51:11 +0000 Subject: [PATCH] bug #17500 (r=warren). Added code to fire an OnStopNotification to the parent load group if an active group is canceled. git-svn-id: svn://10.0.0.236/trunk@52861 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/netwerk/base/src/nsLoadGroup.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mozilla/netwerk/base/src/nsLoadGroup.cpp b/mozilla/netwerk/base/src/nsLoadGroup.cpp index 0eb0d1957af..4c9a29e7f88 100644 --- a/mozilla/netwerk/base/src/nsLoadGroup.cpp +++ b/mozilla/netwerk/base/src/nsLoadGroup.cpp @@ -343,6 +343,9 @@ nsLoadGroup::Cancel() rv = mObserver->OnStopRequest(mDefaultLoadChannel, nsnull, NS_BINDING_ABORTED, nsnull); } + if (mParent) { + mParent->SubGroupIsEmpty(NS_BINDING_ABORTED); + } } return rv; } @@ -585,8 +588,6 @@ nsLoadGroup::RemoveChannel(nsIChannel *channel, nsISupports* ctxt, this, channel, uriStr, status)); nsCRT::free(uriStr); #endif - mIsActive = PR_FALSE; - if (mObserver) { PR_LOG(gLoadGroupLog, PR_LOG_DEBUG, ("LOADGROUP: %x Firing OnStopRequest(...).\n", @@ -596,6 +597,8 @@ nsLoadGroup::RemoveChannel(nsIChannel *channel, nsISupports* ctxt, } // return with rv, below } + mIsActive = PR_FALSE; + if (mParent) { mParent->SubGroupIsEmpty(status); }