Sync back work

Author: LoneWandererProductions

CommonControls.Images/Thumbnails.xaml.cs

@@ -9,7 +9,6 @@
 // ReSharper disable MemberCanBeInternal
 // ReSharper disable MemberCanBePrivate.Global
 // ReSharper disable EventNeverSubscribedTo.Global
-// ReSharper disable EventNeverSubscribedTo.Global
 // ReSharper disable UnusedAutoPropertyAccessor.Global
 // ReSharper disable UnusedType.Global
 // ReSharper disable UnusedMember.Global
@@ -656,41 +655,33 @@ await Application.Current.Dispatcher.InvokeAsync(() =>
         /// <param name="width">The width.</param>
         /// <param name="height">The height.</param>
         /// <returns>The loaded and resized Image</returns>
-        private static async Task<BitmapImage> GetBitmapImageFileStreamAsync(string filePath, int width, int height)
+        private static async Task<BitmapImage?> GetBitmapImageFileStreamAsync(string filePath, int width, int height)
         {
-            return string.IsNullOrWhiteSpace(filePath) || !File.Exists(filePath)
-                ? null
-                : await Task.Run(() =>
-                {
-                    BitmapImage bitmapImage = null;
+            if (string.IsNullOrWhiteSpace(filePath) || !File.Exists(filePath)) return null;
 
-                    Application.Current.Dispatcher.Invoke(() =>
+            return await Task.Run(() =>
+            {
+                try
+                {
+                    var bitmapImage = new BitmapImage();
+                    using (var stream = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read))
                     {
-                        FileStream stream = null;
-                        try
-                        {
-                            bitmapImage = new BitmapImage();
-                            stream = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read);
-                            bitmapImage.BeginInit();
-                            bitmapImage.CacheOption = BitmapCacheOption.OnLoad;
-                            bitmapImage.DecodePixelWidth = width;
-                            bitmapImage.DecodePixelHeight = height;
-                            bitmapImage.StreamSource = stream;
-                            bitmapImage.EndInit();
-                            bitmapImage.Freeze();
-                        }
-                        catch (Exception ex)
-                        {
-                            Trace.WriteLine($"{ComCtlResources.ErrorCouldNotLoadImage} {ex.Message}");
-                        }
-                        finally
-                        {
-                            stream?.Dispose();
-                        }
-                    });
-
+                        bitmapImage.BeginInit();
+                        bitmapImage.CacheOption = BitmapCacheOption.OnLoad;
+                        bitmapImage.DecodePixelWidth = width;
+                        // bitmapImage.DecodePixelHeight = height; // Preserving aspect ratio usually requires setting only one dimension
+                        bitmapImage.StreamSource = stream;
+                        bitmapImage.EndInit();
+                        bitmapImage.Freeze(); // Crucial: Makes it accessible to the UI thread
+                    }
                     return bitmapImage;
-                });
+                }
+                catch (Exception ex)
+                {
+                    Trace.WriteLine($"{ComCtlResources.ErrorCouldNotLoadImage} {ex.Message}");
+                    return null;
+                }
+            });
         }
 
         /// <summary>
@@ -990,7 +981,6 @@ private void Dispose(bool disposing)
             _disposed = true;
         }
 
-
         /// <summary>
         ///     Finalizes this instance.
         /// </summary>
@@ -999,4 +989,4 @@ private void Dispose(bool disposing)
             Dispose(false);
         }
     }
-}
+}