Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes bug 74118 "can't launch with a new profile" r=bryner, sr=mscott

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@91268 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
darin%netscape.com
2001-04-04 07:28:51 +00:00
parent 93a44d86ec
commit 30bbfdcd43
1 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
mozilla/netwerk/base/src/nsInputStreamChannel.cpp
View File

@@ -476,25 +476,22 @@ NS_IMETHODIMP
nsStreamIOChannel::OnStopRequest(nsIRequest *request, nsISupports* context,
nsresult aStatus, const PRUnichar* aStatusArg)
{
nsresult rv;
if (mUserObserver)
mUserObserver->OnStopRequest(this, context, aStatus, aStatusArg);
if (mUserObserver) {
rv = mUserObserver->OnStopRequest(this, context, aStatus, aStatusArg);
if (NS_FAILED(rv)) return rv;
}
if (mLoadGroup) {
if (NS_SUCCEEDED(rv)) {
rv = mLoadGroup->RemoveRequest(this, context, aStatus, aStatusArg);
if (NS_FAILED(rv)) return rv;
}
}
if (mLoadGroup)
mLoadGroup->RemoveRequest(this, context, aStatus, aStatusArg);
// Release the reference to the consumer stream listener...
mUserObserver = null_nsCOMPtr();
mFileTransport = null_nsCOMPtr();
mRequest = 0;
mFileTransport = 0;
mUserObserver = 0;
return mStreamIO->Close(aStatus);
// Make sure the stream io is closed
mStreamIO->Close(aStatus);
// There is no point in returning anything other than NS_OK
return NS_OK;
}
////////////////////////////////////////////////////////////////////////////////