From 4d92beac4eca5bfae06fe70a24f5e7bc9a8fe27b Mon Sep 17 00:00:00 2001 From: Mike Rosack Date: Tue, 12 Feb 2013 19:56:57 -0600 Subject: [PATCH] Make sure timer is stopped on unload so panorama can be garbage collected --- MahApps.Metro/Controls/Panorama.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/MahApps.Metro/Controls/Panorama.cs b/MahApps.Metro/Controls/Panorama.cs index 6d4a4204df..8c89236e28 100644 --- a/MahApps.Metro/Controls/Panorama.cs +++ b/MahApps.Metro/Controls/Panorama.cs @@ -78,7 +78,16 @@ public Panorama() animationTimer.Interval = new TimeSpan(0, 0, 0, 0, 20); animationTimer.Tick += HandleWorldTimerTick; - animationTimer.Start(); + + this.Loaded += (sender, e) => + { + animationTimer.Start(); + }; + + this.Unloaded += (sender, e) => + { + animationTimer.Stop(); + }; } static Panorama()