Fix loading WPF BitmapImage from a network stream (#793)

* Do not freeze `BitmapImage` if it cannot be frozen (#792) * Remove whitespace Co-authored-by: Glenn <5834289+glennawatson@users.noreply.github.com> Co-authored-by: David Vreony <dpvreony@users.noreply.github.com>
reactiveui · Oct 21, 2021 · 24009a9 · 24009a9
1 parent a8efa69
commit 24009a9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/src/Splat.Drawing/Platforms/net4/Bitmaps/PlatformBitmapLoader.cs b/src/Splat.Drawing/Platforms/net4/Bitmaps/PlatformBitmapLoader.cs
@@ -79,7 +79,11 @@ private static void WithInit(BitmapImage source, Action<BitmapImage> block)
             source.BeginInit();
             block(source);
             source.EndInit();
-            source.Freeze();
+
+            if (source.CanFreeze)
+            {
+                source.Freeze();
+            }
         }
     }
 }
diff --git a/src/Splat.Drawing/Platforms/net5/Bitmaps/PlatformBitmapLoader.cs b/src/Splat.Drawing/Platforms/net5/Bitmaps/PlatformBitmapLoader.cs
@@ -86,7 +86,11 @@ private static void WithInit(BitmapImage source, Action<BitmapImage> block)
             source.BeginInit();
             block(source);
             source.EndInit();
-            source.Freeze();
+
+            if (source.CanFreeze)
+            {
+                source.Freeze();
+            }
         }
     }
 }
diff --git a/src/Splat.Drawing/Platforms/netcoreapp3/Bitmaps/PlatformBitmapLoader.cs b/src/Splat.Drawing/Platforms/netcoreapp3/Bitmaps/PlatformBitmapLoader.cs
@@ -86,7 +86,11 @@ private static void WithInit(BitmapImage source, Action<BitmapImage> block)
             source.BeginInit();
             block(source);
             source.EndInit();
-            source.Freeze();
+
+            if (source.CanFreeze)
+            {
+                source.Freeze();
+            }
         }
     }
 }