Merge pull request #439 from cairoshell/reduce-leakage

Reduce leakage
cairoshell · Sep 26, 2020 · 4f926c1 · 4f926c1
2 parents 1f5e9e5 + 5ce37ec
commit 4f926c1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/Cairo Desktop/Cairo Desktop/TaskButton.xaml b/Cairo Desktop/Cairo Desktop/TaskButton.xaml
@@ -5,7 +5,8 @@
              x:Class="CairoDesktop.TaskButton"
              x:Name="UserControl"
              xmlns:support="clr-namespace:CairoDesktop.SupportingClasses" 
-             Loaded="UserControl_Loaded">
+             Loaded="UserControl_Loaded"
+             Unloaded="TaskButton_OnUnloaded">
     <UserControl.Resources>
         <ResourceDictionary>
             <support:TaskButtonStyleConverter x:Key="styleConverter" />

diff --git a/Cairo Desktop/Cairo Desktop/TaskButton.xaml.cs b/Cairo Desktop/Cairo Desktop/TaskButton.xaml.cs
@@ -122,6 +122,12 @@ private void UserControl_Loaded(object sender, RoutedEventArgs e)
             thumbTimer.Tick += thumbTimer_Tick;
         }
 
+        private void TaskButton_OnUnloaded(object sender, RoutedEventArgs e)
+        {
+            Window.PropertyChanged -= Window_PropertyChanged;
+            Settings.Instance.PropertyChanged -= Instance_PropertyChanged;
+        }
+
         private void Instance_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             if (e != null && !string.IsNullOrWhiteSpace(e.PropertyName))

diff --git a/Cairo Desktop/CairoDesktop.Common/IconImageConverter.cs b/Cairo Desktop/CairoDesktop.Common/IconImageConverter.cs
@@ -48,6 +48,7 @@ public static ImageSource GetImageFromHIcon(IntPtr hIcon, bool returnDefault = t
                 try
                 {
                     bs = System.Windows.Interop.Imaging.CreateBitmapSourceFromHIcon(hIcon, Int32Rect.Empty, BitmapSizeOptions.FromEmptyOptions());
+                    bs.Freeze();
                     NativeMethods.DestroyIcon(hIcon);
                 }
                 catch

diff --git a/Cairo Desktop/CairoDesktop.WindowsTray/NotificationArea.cs b/Cairo Desktop/CairoDesktop.WindowsTray/NotificationArea.cs
@@ -269,9 +269,13 @@ private bool SysTrayCallback(uint message, NOTIFYICONDATA nicData)
                                     try
                                     {
                                         System.Windows.Media.Imaging.BitmapSource bs = System.Windows.Interop.Imaging.CreateBitmapSourceFromHIcon((IntPtr)nicData.hIcon, Int32Rect.Empty, System.Windows.Media.Imaging.BitmapSizeOptions.FromEmptyOptions());
+                                        DestroyIcon((IntPtr)nicData.hIcon);
 
                                         if (bs != null)
+                                        {
+                                            bs.Freeze();
                                             trayIcon.Icon = bs;
+                                        }
                                     }
                                     catch
                                     {