improved all implementations of iDisposable

ArcadeRenegade · Feb 1, 2016 · ec59ca8 · ec59ca8
1 parent 6826494
commit ec59ca8
Show file tree

Hide file tree

Showing 2 changed files with 231 additions and 63 deletions.
diff --git a/SidebarDiagnostics/AppBarModel.cs b/SidebarDiagnostics/AppBarModel.cs
@@ -16,8 +16,27 @@ public AppBarModel()
 
         public void Dispose()
         {
-            DisposeClock();
-            DisposeMonitors();
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!_disposed)
+            {
+                if (disposing)
+                {
+                    DisposeClock();
+                    DisposeMonitors();
+                }
+
+                _disposed = true;
+            }
+        }
+
+        ~AppBarModel()
+        {
+            Dispose(false);
         }
 
         public void Restart()
@@ -188,5 +207,7 @@ public MonitorManager MonitorManager
         private DispatcherTimer _clockTimer { get; set; }
 
         private DispatcherTimer _monitorTimer { get; set; }
+
+        private bool _disposed { get; set; } = false;
     }
 }