From 9b3f0bfb55fe12fef752058d1ea495d07b1fdbce Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Sat, 21 May 2016 11:01:32 +1000
Subject: [PATCH] Always dispose of timers.

---
 Player/Player.Timers.cs | 18 ++++++++++++++++++
 Player/Player.cs        |  7 +------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/Player/Player.Timers.cs b/Player/Player.Timers.cs
index 5d7cd113f..d0c9020eb 100644
--- a/Player/Player.Timers.cs
+++ b/Player/Player.Timers.cs
@@ -131,5 +131,23 @@ namespace MCGalaxy {
             consecutivemessages = 0;
             Player.Message(this, "Remember, no &cspamming %Snext time!");
         }
+        
+        void DisposeTimers() {
+            loginTimer.Stop();
+            loginTimer.Elapsed -= LoginTimerElapsed;
+            loginTimer.Dispose();
+
+            extraTimer.Stop();
+            extraTimer.Elapsed -= ExtraTimerElapsed;
+            extraTimer.Dispose();
+            
+            checkTimer.Stop();
+            checkTimer.Elapsed -= CheckTimerElapsed;
+            checkTimer.Dispose();
+            
+            muteTimer.Stop();
+            muteTimer.Elapsed -= MuteTimerElapsed;
+            muteTimer.Dispose();
+        }
     }
 }
diff --git a/Player/Player.cs b/Player/Player.cs
index 87a01aa45..06a7de21c 100644
--- a/Player/Player.cs
+++ b/Player/Player.cs
@@ -561,12 +561,7 @@ namespace MCGalaxy {
                 }
                 // FlyBuffer.Clear();
                 SaveIgnores();
-                checkTimer.Stop();
-                checkTimer.Elapsed -= CheckTimerElapsed;
-                checkTimer.Dispose();
-                muteTimer.Stop();
-                muteTimer.Elapsed -= MuteTimerElapsed;
-                muteTimer.Dispose();
+                DisposeTimers();
                 afkCount = 0;
                 afkStart = DateTime.Now;
                 IsAfk = false;