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/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;
     }
 }