From f021256d53358db6539b6390ed19344eba1c66f7 Mon Sep 17 00:00:00 2001 From: "sfraser%netscape.com" Date: Thu, 9 Mar 2000 22:20:56 +0000 Subject: [PATCH] Fix for 30894 -- crash closing compose window while loading reply. r=buster, bienvenu, akkana, a=jar git-svn-id: svn://10.0.0.236/trunk@62495 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/editor/base/nsInterfaceState.cpp | 7 ++++--- mozilla/editor/composer/src/nsInterfaceState.cpp | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/mozilla/editor/base/nsInterfaceState.cpp b/mozilla/editor/base/nsInterfaceState.cpp index 588e7dc2211..e517a8bb04d 100644 --- a/mozilla/editor/base/nsInterfaceState.cpp +++ b/mozilla/editor/base/nsInterfaceState.cpp @@ -64,9 +64,6 @@ nsInterfaceState::nsInterfaceState() nsInterfaceState::~nsInterfaceState() { - // cancel any outstanding udpate timer - if (mUpdateTimer) - mUpdateTimer->Cancel(); } NS_IMPL_ADDREF(nsInterfaceState); @@ -103,6 +100,10 @@ nsInterfaceState::TableCellNotification(nsIDOMNode* aNode, PRInt32 aOffset) NS_IMETHODIMP nsInterfaceState::NotifyDocumentWillBeDestroyed() { + // cancel any outstanding udpate timer + if (mUpdateTimer) + mUpdateTimer->Cancel(); + return NS_OK; } diff --git a/mozilla/editor/composer/src/nsInterfaceState.cpp b/mozilla/editor/composer/src/nsInterfaceState.cpp index 588e7dc2211..e517a8bb04d 100644 --- a/mozilla/editor/composer/src/nsInterfaceState.cpp +++ b/mozilla/editor/composer/src/nsInterfaceState.cpp @@ -64,9 +64,6 @@ nsInterfaceState::nsInterfaceState() nsInterfaceState::~nsInterfaceState() { - // cancel any outstanding udpate timer - if (mUpdateTimer) - mUpdateTimer->Cancel(); } NS_IMPL_ADDREF(nsInterfaceState); @@ -103,6 +100,10 @@ nsInterfaceState::TableCellNotification(nsIDOMNode* aNode, PRInt32 aOffset) NS_IMETHODIMP nsInterfaceState::NotifyDocumentWillBeDestroyed() { + // cancel any outstanding udpate timer + if (mUpdateTimer) + mUpdateTimer->Cancel(); + return NS_OK; }