From 1419c834ac207addcc88a1a6793a1486afce042a Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Sat, 30 Mar 2024 08:39:57 +0100 Subject: [PATCH] BaseDataWindow: Fix season modifier crash --- Elwig/Windows/BaseDataWindow.xaml.Season.cs | 4 ++-- Elwig/Windows/BaseDataWindow.xaml.cs | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Elwig/Windows/BaseDataWindow.xaml.Season.cs b/Elwig/Windows/BaseDataWindow.xaml.Season.cs index 53d14c2..a85ca15 100644 --- a/Elwig/Windows/BaseDataWindow.xaml.Season.cs +++ b/Elwig/Windows/BaseDataWindow.xaml.Season.cs @@ -13,12 +13,12 @@ namespace Elwig.Windows { private bool _seasonUpdate = false; private async Task SeasonsInitEditing(AppDbContext ctx) { - ControlUtils.RenewItemsSource(SeasonList, await ctx.Seasons.OrderByDescending(s => s.Year).ToListAsync()); + ControlUtils.RenewItemsSource(SeasonList, await ctx.Seasons.Include(s => s.Modifiers).OrderByDescending(s => s.Year).ToListAsync()); SeasonList_SelectionChanged(null, null); } private async Task SeasonsFinishEditing(AppDbContext ctx) { - ControlUtils.RenewItemsSource(SeasonList, await ctx.Seasons.OrderByDescending(s => s.Year).Include(s => s.Modifiers).ToListAsync()); + ControlUtils.RenewItemsSource(SeasonList, await ctx.Seasons.Include(s => s.Modifiers).OrderByDescending(s => s.Year).ToListAsync()); _seasonChanged = false; } diff --git a/Elwig/Windows/BaseDataWindow.xaml.cs b/Elwig/Windows/BaseDataWindow.xaml.cs index 2b5f0d0..19d9698 100644 --- a/Elwig/Windows/BaseDataWindow.xaml.cs +++ b/Elwig/Windows/BaseDataWindow.xaml.cs @@ -142,6 +142,7 @@ namespace Elwig.Windows { FillInputs(App.Client); ControlUtils.RenewItemsSource(SeasonList, await ctx.Seasons .OrderByDescending(s => s.Year) + .Include(s => s.Modifiers) .ToListAsync(), null, ControlUtils.RenewSourceDefault.First); var year = (SeasonList.SelectedItem as Season)?.Year; ControlUtils.RenewItemsSource(BranchList, await ctx.Branches