call ImageSource.Freeze to prevent exceptions in some cases

radj307 · Oct 10, 2023 · f938632 · f938632
1 parent 040c574
commit f938632
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/VolumeControl/ViewModels/AudioDeviceVM.cs b/VolumeControl/ViewModels/AudioDeviceVM.cs
@@ -20,6 +20,7 @@ public AudioDeviceVM(AudioDevice audioDevice)
             AudioDevice = audioDevice;
 
             Icon = IconExtractor.TryExtractFromPath(AudioDevice.IconPath, out ImageSource icon) ? icon : null;
+            Icon?.Freeze(); //< prevents WPF exceptions in some cases
             Sessions = new();
 
             // attach events to add and remove audio sessions from the Sessions list

diff --git a/VolumeControl/ViewModels/AudioSessionVM.cs b/VolumeControl/ViewModels/AudioSessionVM.cs
@@ -60,6 +60,7 @@ public ImageSource? Icon
             var iconPath = AudioSession.AudioSessionControl.IconPath;
             if (iconPath.Length > 0 && IconExtractor.TryExtractFromPath(iconPath, out ImageSource wasapiImageSource))
             {
+                wasapiImageSource.Freeze();
                 return wasapiImageSource;
             }
 
@@ -71,6 +72,7 @@ public ImageSource? Icon
             {
                 if (proc.GetMainModulePath() is string path && IconExtractor.TryExtractFromPath(path, out ImageSource processImageSource))
                 {
+                    processImageSource.Freeze();
                     return processImageSource;
                 }
             }