fix dispose bug

hbons · Oct 15, 2015 · c1988d6 · c1988d6
1 parent 8ea9df0
commit c1988d6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/SparkleLib/SparkleListenerBase.cs b/SparkleLib/SparkleListenerBase.cs
@@ -71,14 +71,15 @@ public SparkleListenerBase (Uri server, string folder_identifier)
             Server = server;
             this.channels.Add (folder_identifier);
 
-            this.reconnect_timer.Elapsed += delegate {
-                if (!IsConnected && !IsConnecting)
-                    Reconnect ();
-            };
-
+            this.reconnect_timer.Elapsed += OnTimerElapsed;
             this.reconnect_timer.Start ();
         }
 
+        private void OnTimerElapsed(object sender, EventArgs args)
+        {
+            if (!IsConnected && !IsConnecting)
+                Reconnect ();
+        }
 
         public void Announce (SparkleAnnouncement announcement)
         {
@@ -166,7 +167,11 @@ public virtual void Dispose ()
         {
             if (this.reconnect_timer != null) {
                 this.reconnect_timer.Stop ();
+
+                this.reconnect_timer.Elapsed -= OnTimerElapsed;
                 this.reconnect_timer.Dispose ();
+
+                this.reconnect_timer = null;
             }
         }
 

diff --git a/SparkleLib/SparkleRepoBase.cs b/SparkleLib/SparkleRepoBase.cs
@@ -613,8 +613,12 @@ public void Resume (string message)
 
         public void Dispose ()
         {
-            this.remote_timer.Stop ();
-            this.remote_timer.Dispose ();
+            if (remote_timer != null) {
+                this.remote_timer.Elapsed -= RemoteTimerElapsedDelegate;
+                this.remote_timer.Stop ();
+                this.remote_timer.Dispose ();
+                this.remote_timer = null;
+            }
 
             this.listener.Disconnected         -= ListenerDisconnectedDelegate;
             this.listener.AnnouncementReceived -= ListenerAnnouncementReceivedDelegate;