From c88eb2fd9c8d7a36b2a5c23cad4685241c9e0556 Mon Sep 17 00:00:00 2001 From: "rpotts%netscape.com" Date: Fri, 21 Aug 1998 06:21:52 +0000 Subject: [PATCH] Fixed a crash when Destroy(...) was called without first calling Init(...) git-svn-id: svn://10.0.0.236/trunk@8302 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsWebShell.cpp | 4 +++- mozilla/webshell/src/nsWebShell.cpp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index 2b413c045a5..85ce19dc707 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -600,7 +600,9 @@ nsWebShell::Destroy() nsresult rv = NS_OK; // Stop any URLs that are currently being loaded... - mDocLoader->Stop(); + if (nsnull != mDocLoader) { + mDocLoader->Stop(); + } // Cancel any timers that were set for this loader. CancelRefreshURLTimers(); diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp index 2b413c045a5..85ce19dc707 100644 --- a/mozilla/webshell/src/nsWebShell.cpp +++ b/mozilla/webshell/src/nsWebShell.cpp @@ -600,7 +600,9 @@ nsWebShell::Destroy() nsresult rv = NS_OK; // Stop any URLs that are currently being loaded... - mDocLoader->Stop(); + if (nsnull != mDocLoader) { + mDocLoader->Stop(); + } // Cancel any timers that were set for this loader. CancelRefreshURLTimers();