From f235d5b380bfef662b9484b66c7b41e177d9268e Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Sun, 7 Jul 2024 00:13:22 +0200 Subject: [PATCH] DeliveryAdminWindow: Fix ModifierInput_SelectionChanged event --- Elwig/Windows/DeliveryAdminWindow.xaml.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml.cs b/Elwig/Windows/DeliveryAdminWindow.xaml.cs index a7574f4..2b9d159 100644 --- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs +++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs @@ -1154,12 +1154,12 @@ namespace Elwig.Windows { } private async Task UpdateLsNr() { - if (ViewModel.Date == "" || ViewModel.Branch == null) { + if (string.IsNullOrEmpty(ViewModel.Date) || ViewModel.Branch == null) { ViewModel.LsNr = ""; } else { try { var branch = (Branch)BranchInput.SelectedItem; - var date = DateOnly.ParseExact(ViewModel.Date, "dd.MM.yyyy"); + var date = DateOnly.ParseExact(ViewModel.Date!, "dd.MM.yyyy"); using var ctx = new AppDbContext(); var lnr = await ctx.NextLNr(date); ViewModel.LsNr = Utils.GenerateLsNr(date, branch.ZwstId, lnr); @@ -1287,7 +1287,10 @@ namespace Elwig.Windows { if (App.Client.IsMatzen) { var kl = mod.Where(m => m.Name.StartsWith("Klasse ")); if (kl.Count() > 1) { - foreach (var r in kl.Take(kl.Count() - 1)) ModifiersInput.SelectedItems.Remove(r); + App.MainDispatcher.BeginInvoke(() => { + foreach (var r in kl.Take(kl.Count() - 1)) + ModifiersInput.SelectedItems.Remove(r); + }); } } }