From 231d4e3152a9c27a73b6ac7badbe6be673aa3ddf Mon Sep 17 00:00:00 2001 From: Steve Block Date: Thu, 8 Oct 2009 17:19:54 +0100 Subject: Merge webkit.org at R49305 : Automatic merge by git. Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7 --- WebCore/loader/ResourceLoader.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'WebCore/loader/ResourceLoader.cpp') diff --git a/WebCore/loader/ResourceLoader.cpp b/WebCore/loader/ResourceLoader.cpp index 5ad181b..2dac844 100644 --- a/WebCore/loader/ResourceLoader.cpp +++ b/WebCore/loader/ResourceLoader.cpp @@ -94,8 +94,9 @@ void ResourceLoader::releaseResources() if (m_handle) { // Clear out the ResourceHandle's client so that it doesn't try to call - // us back after we release it. - m_handle->setClient(0); + // us back after we release it, unless it has been replaced by someone else. + if (m_handle->client() == this) + m_handle->setClient(0); m_handle = 0; } -- cgit v1.1