tyler/Libation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fix #474

Browse Source
This commit is contained in:
Robert McRackan 2023-02-06 08:35:24 -05:00
parent 85769d797b
commit 39fe7b79d2
4 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/AppScaffolding/AppScaffolding.csproj
View File

@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<Version>9.2.1.1</Version> <Version>9.2.2.1</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Octokit" Version="5.0.0" /> <PackageReference Include="Octokit" Version="5.0.0" />

13
Source/LibationAvalonia/ViewModels/GridEntry.cs
View File

@ -130,8 +130,17 @@ namespace LibationAvalonia.ViewModels
} }
private void PictureStorage_PictureCached(object sender, PictureCachedEventArgs e) private void PictureStorage_PictureCached(object sender, PictureCachedEventArgs e)
{ {
if (e.Definition.PictureId == Book.PictureId) // state validation
if (e is null ||
e.Definition.PictureId is null ||
Book?.PictureId is null ||
e.Picture is null ||
e.Picture.Length == 0)
return;
// logic validation
if (e.Definition.PictureId == Book.PictureId)
{ {
using var ms = new System.IO.MemoryStream(e.Picture); using var ms = new System.IO.MemoryStream(e.Picture);
Cover = new Avalonia.Media.Imaging.Bitmap(ms); Cover = new Avalonia.Media.Imaging.Bitmap(ms);

11
Source/LibationWinForms/GridView/GridEntry.cs
View File

@ -140,7 +140,16 @@ namespace LibationWinForms.GridView
private void PictureStorage_PictureCached(object sender, PictureCachedEventArgs e) private void PictureStorage_PictureCached(object sender, PictureCachedEventArgs e)
{ {
if (e.Definition.PictureId == Book.PictureId) // state validation
if (e is null ||
e.Definition.PictureId is null ||
Book?.PictureId is null ||
e.Picture is null ||
e.Picture.Length == 0)
return;
// logic validation
if (e.Definition.PictureId == Book.PictureId)
{ {
Cover = ImageReader.ToImage(e.Picture); Cover = ImageReader.ToImage(e.Picture);
PictureStorage.PictureCached -= PictureStorage_PictureCached; PictureStorage.PictureCached -= PictureStorage_PictureCached;

10
Source/LibationWinForms/LibationWinForms.csproj
View File

@ -64,16 +64,6 @@
<DependentUpon>SettingsDialog.cs</DependentUpon> <DependentUpon>SettingsDialog.cs</DependentUpon>
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<ItemGroup>
<Compile Update="Form1.*.cs">
<DependentUpon>Form1.cs</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<Compile Update="Form1.*.cs">
<DependentUpon>Form1.cs</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Update="Properties\Resources.Designer.cs"> <Compile Update="Properties\Resources.Designer.cs">