From 3a939ed2b0a6fcc3e91e96aeeda45f3a2a2a20ee Mon Sep 17 00:00:00 2001
From: "bnesse%netscape.com"
 <bnesse%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 13 Jul 2001 17:38:37 +0000
Subject: [PATCH] Fix for bug 85231. Fix MLK/crasher caused by cyclical xpcom
 references in nsPluginInstance and nsTimer. r=av, peterlubczynski. sr=scc.
 PDT+

git-svn-id: svn://10.0.0.236/branches/MOZILLA_0_9_2_BRANCH@99191 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/html/base/src/nsObjectFrame.cpp     | 3 ++-
 mozilla/modules/plugin/base/src/nsPluginViewer.cpp | 3 ++-
 mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp   | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/mozilla/layout/html/base/src/nsObjectFrame.cpp b/mozilla/layout/html/base/src/nsObjectFrame.cpp
index 60a30115bea..f24b8ab653d 100644
--- a/mozilla/layout/html/base/src/nsObjectFrame.cpp
+++ b/mozilla/layout/html/base/src/nsObjectFrame.cpp
@@ -1612,7 +1612,7 @@ nsPluginInstanceOwner::~nsPluginInstanceOwner()
 
   // shut off the timer.
   if (mPluginTimer != nsnull) {
-    mPluginTimer->Cancel();
+    CancelTimer();
   }
 
   if (nsnull != mInstance)
@@ -3099,6 +3099,7 @@ void nsPluginInstanceOwner::CancelTimer()
 {
     if (mPluginTimer) {
         mPluginTimer->Cancel();
+        mPluginTimer = nsnull;
     }
 }
 
diff --git a/mozilla/modules/plugin/base/src/nsPluginViewer.cpp b/mozilla/modules/plugin/base/src/nsPluginViewer.cpp
index 099c41ced47..7bdb1aa52a0 100644
--- a/mozilla/modules/plugin/base/src/nsPluginViewer.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginViewer.cpp
@@ -915,7 +915,7 @@ pluginInstanceOwner :: ~pluginInstanceOwner()
 {
   // shut off the timer.
   if (mPluginTimer != nsnull) {
-    mPluginTimer->Cancel();
+    CancelTimer();
   }
 
   if (nsnull != mInstance)
@@ -1254,6 +1254,7 @@ void pluginInstanceOwner::CancelTimer()
 {
     if (mPluginTimer) {
         mPluginTimer->Cancel();
+        mPluginTimer = nsnull;
     }
 }
 
diff --git a/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp b/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp
index 099c41ced47..7bdb1aa52a0 100644
--- a/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp
+++ b/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp
@@ -915,7 +915,7 @@ pluginInstanceOwner :: ~pluginInstanceOwner()
 {
   // shut off the timer.
   if (mPluginTimer != nsnull) {
-    mPluginTimer->Cancel();
+    CancelTimer();
   }
 
   if (nsnull != mInstance)
@@ -1254,6 +1254,7 @@ void pluginInstanceOwner::CancelTimer()
 {
     if (mPluginTimer) {
         mPluginTimer->Cancel();
+        mPluginTimer = nsnull;
     }
 }