Timers now disposed of individually instead of in component

ZsoltGajdacs · Feb 7, 2019 · baf880e · baf880e
1 parent 5c84ebb
commit baf880e
Showing 1 changed file with 4 additions and 14 deletions.
diff --git a/BlinkReminder/Windows/TaskbarPresence.xaml.cs b/BlinkReminder/Windows/TaskbarPresence.xaml.cs
@@ -36,9 +36,6 @@ public partial class TaskbarPresence : Window, IDisposable
         private const string TOOLTIP_SHORT_DISABLED = "Short breaks are disabled";
         private const int ONE_MINUTE_IN_MS = 60000;
 
-        // Component holder for disposal
-        private IContainer components;
-
         // Keyboard input catcher
         private KeyboardHook keyTrap;
 
@@ -102,14 +99,6 @@ private void SetDefaultValues()
             tooltipRefreshTimer.AutoReset = true;
             tooltipRefreshTimer.Elapsed += TaskbarTimer_Elapsed;
 
-            // Component for disposal
-            components = new Container();
-
-            // Add to Component holder for proper disposal later
-            components.Add(shortIntervalTimer);
-            components.Add(longIntervalTimer);
-            components.Add(tooltipRefreshTimer);
-
             isShortIntervalTimerDone = false;
             isLongIntervalTimerDone = false;
         }
@@ -524,8 +513,6 @@ private void StartPauseTimer(double amountMillisec)
             };
             pauseTimer.Elapsed += PauseTimer_Elapsed;
             pauseTimer.Start();
-
-            components.Add(pauseTimer);
         }
 
         /// <summary>
@@ -668,7 +655,10 @@ protected virtual void Dispose(bool disposing)
             {
                 if (disposing)
                 {
-                    components.Dispose();
+                    shortIntervalTimer.Dispose();
+                    longIntervalTimer.Dispose();
+                    tooltipRefreshTimer.Dispose();
+                    pauseTimer.Dispose();
                     taskbarIcon.Dispose();
 
                     if (keyTrap != null)