Browse Source

Fix ImageBrush crash when source bitmap gets disposed (#13506)

release/11.0.6
Nikita Tsukanov 3 years ago
committed by Max Katz
parent
commit
5a7479ff07
  1. 12
      src/Avalonia.Base/Media/Imaging/Bitmap.cs

12
src/Avalonia.Base/Media/Imaging/Bitmap.cs

@ -240,6 +240,16 @@ namespace Avalonia.Media.Imaging
return AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>(); return AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
} }
IRef<IBitmapImpl> IImageBrushSource.Bitmap => PlatformImpl; IRef<IBitmapImpl>? IImageBrushSource.Bitmap
{
get
{
// TODO12: We should probably make PlatformImpl to be nullable or make it possible to check
// and fix IRef<T> in general (right now Item is not nullable while it internally is)
if (PlatformImpl.Item == null!)
return null;
return PlatformImpl;
}
}
} }
} }

Loading…
Cancel
Save