From 57d7d53ab805a42a8d6749f26223b8dad019b100 Mon Sep 17 00:00:00 2001
From: Doug Turner <dougt@meer.net>
Date: Sat, 7 Nov 2009 19:01:29 -0800
Subject: [PATCH] Bug 527182 - Crash when entering info on twitter. r=blassey

---
 editor/libeditor/text/nsTextEditRules.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/editor/libeditor/text/nsTextEditRules.cpp b/editor/libeditor/text/nsTextEditRules.cpp
index 32e0aca51437..94c6cafc6464 100644
--- a/editor/libeditor/text/nsTextEditRules.cpp
+++ b/editor/libeditor/text/nsTextEditRules.cpp
@@ -110,6 +110,9 @@ nsTextEditRules::nsTextEditRules()
 nsTextEditRules::~nsTextEditRules()
 {
    // do NOT delete mEditor here.  We do not hold a ref count to mEditor.  mEditor owns our lifespan.
+
+  if (mTimer)
+    mTimer->Cancel();
 }
 
 /********************************************************
@@ -194,6 +197,9 @@ nsTextEditRules::Init(nsPlaintextEditor *aEditor, PRUint32 aFlags)
 NS_IMETHODIMP
 nsTextEditRules::DetachEditor()
 {
+  if (mTimer)
+    mTimer->Cancel();
+
   mEditor = nsnull;
   return NS_OK;
 }