Bump version to 0.13.9

CHANGELOG.md

@@ -3,6 +3,19 @@ Changelog
 =========
 
 
+[v0.13.9][v0.13.9] (2025-05-05) {#v0.13.9}
+------------------------------------------
+
+### Sonstiges {#v0.13.9-misc}
+
+* Abhängigkeiten aktualisiert. (bf0db37872, 4af2fa256e, d1c07ee92a, 41c5288fc5)
+* Automatisches Aktualisieren der Synchroisations-URL (`https://elwig.at/clients/` -> `https://sync.elwig.at/`). (e50e7337e6)
+
+[v0.13.9]: https://git.necronda.net/winzer/elwig/releases/tag/v0.13.9
+
+
+
+
 [v0.13.8][v0.13.8] (2025-02-21) {#v0.13.8}
 ------------------------------------------
 

Elwig/App.xaml.cs

@@ -197,12 +197,10 @@ namespace Elwig {
             var ch = CurrentLastWrite;
             if (ch > CurrentApp.LastChanged)
                 CurrentApp.LastChanged = ch;
-            MainDispatcher.Invoke(() => {
+            foreach (Window w in CurrentApp.Windows) {
-                foreach (Window w in CurrentApp.Windows) {
+                if (w is not ContextWindow c) continue;
-                    if (w is not ContextWindow c) continue;
+                MainDispatcher.BeginInvoke(c.HintContextChange);
-                    MainDispatcher.BeginInvoke(c.HintContextChange);
+            }
-                }
-            });
         }
 
         private void OnAutoUpdateTimer(object? sender, EventArgs? evt) {

Elwig/Elwig.csproj

@@ -7,7 +7,7 @@
     <UseWPF>true</UseWPF>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>0.13.8</Version>
+    <Version>0.13.9</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <ApplicationManifest>app.manifest</ApplicationManifest>

Elwig/Helpers/Utils.cs

@@ -499,39 +499,34 @@ namespace Elwig.Helpers {
             if (App.Config.Smtp == null)
                 return false;
 
-            Mouse.OverrideCursor = Cursors.Wait;
+            SmtpClient? client = null;
+            try {
+                Mouse.OverrideCursor = Cursors.AppStarting;
+                client = await GetSmtpClient();
 
-            var success = await Task.Run(async () => {
+                using var msg = new MimeMessage();
-                SmtpClient? client = null;
+                msg.From.Add(new MailboxAddress(App.Client.NameFull, App.Config.Smtp.Value.From));
-                try {
+                msg.To.AddRange(member.EmailAddresses.OrderBy(a => a.Nr).Select(a => new MailboxAddress(member.AdministrativeName, a.Address)));
-                    client = await GetSmtpClient();
+                msg.Subject = subject;
-
+                var body = new Multipart("mixed") {
-                    using var msg = new MimeMessage();
+                    new TextPart("plain") { Text = text }
-                    msg.From.Add(new MailboxAddress(App.Client.NameFull, App.Config.Smtp.Value.From));
+                };
-                    msg.To.AddRange(member.EmailAddresses.OrderBy(a => a.Nr).Select(a => new MailboxAddress(member.AdministrativeName, a.Address)));
+                foreach (var doc in docs) {
-                    msg.Subject = subject;
+                    var name = NormalizeFileName(doc.Title);
-                    var body = new Multipart("mixed") {
+                    body.Add(doc.AsEmailAttachment($"{name}.pdf"));
-                        new TextPart("plain") { Text = text }
-                    };
-                    foreach (var doc in docs) {
-                        var name = NormalizeFileName(doc.Title);
-                        body.Add(doc.AsEmailAttachment($"{name}.pdf"));
-                    }
-                    msg.Body = body;
-                    await client!.SendAsync(msg);
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                    return false;
-                } finally {
-                    if (client != null)
-                        await client.DisconnectAsync(true);
-                    client?.Dispose();
                 }
-                return true;
+                msg.Body = body;
-            });
+                await client!.SendAsync(msg);
-
+            } catch (Exception exc) {
-            Mouse.OverrideCursor = null;
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-            return success;
+                return false;
+            } finally {
+                if (client != null)
+                    await client.DisconnectAsync(true);
+                client?.Dispose();
+                Mouse.OverrideCursor = null;
+            }
+            return true;
         }
 
         public static async Task ExportDocument(Document doc, ExportMode mode, string? filename = null, (Member, string, string)? emailData = null) {

Elwig/Services/AreaComService.cs

@@ -108,8 +108,7 @@ namespace Elwig.Services {
         public static async Task<int> UpdateAreaCommitment(this AreaComAdminViewModel vm, int? oldFbNr) {
             int newFbNr = (int)vm.FbNr!;
 
-            await Task.Run(async () => {
+            using (var ctx = new AppDbContext()) {
-                using var ctx = new AppDbContext();
                 var a = new AreaCom {
                     FbNr = oldFbNr ?? newFbNr,
                     MgNr = (int)vm.MgNr!,
@@ -141,7 +140,7 @@ namespace Elwig.Services {
                 if (newFbNr != a.FbNr) {
                     await ctx.Database.ExecuteSqlAsync($"UPDATE area_commitment SET fbnr = {newFbNr} WHERE fbnr = {oldFbNr}");
                 }
-            });
+            }
 
             App.HintContextChange();
 
@@ -254,16 +253,5 @@ namespace Elwig.Services {
             }
             return grid;
         }
-
-        public static async Task DeleteAreaCom(int fbnr) {
-            await Task.Run(async () => {
-                using var ctx = new AppDbContext();
-                var l = (await ctx.AreaCommitments.FindAsync(fbnr))!;
-                ctx.Remove(l);
-                await ctx.SaveChangesAsync();
-            });
-
-            App.HintContextChange();
-        }
     }
 }

Elwig/Services/DeliveryService.cs

@@ -430,10 +430,9 @@ namespace Elwig.Services {
         }
 
         public static async Task<DeliveryPart> UpdateDeliveryPart(this DeliveryAdminViewModel vm, int? oldYear, int? oldDid, int? oldDpnr, bool dateHasChanged, bool timeHasChanged, bool timeIsDefault) {
-            var p = await Task.Run(async () => {
+            DeliveryPart p;
-                DeliveryPart p;
 
-                using var ctx = new AppDbContext();
+            using (var ctx = new AppDbContext()) {
                 int year = oldYear ?? Utils.CurrentYear;
                 int did = oldDid ?? await ctx.NextDId(year);
                 int dpnr = oldDpnr ?? await ctx.NextDPNr(year, did);
@@ -525,9 +524,7 @@ namespace Elwig.Services {
                 }
 
                 await ctx.SaveChangesAsync();
-
+            }
-                return p;
-            });
 
             App.HintContextChange();
 
@@ -535,10 +532,9 @@ namespace Elwig.Services {
         }
 
         public static async Task<Delivery> SplitDeliveryToMember(int year, int did, int[] weights, int mgnr) {
-            var n = await Task.Run(async () => {
+            Delivery n;
-                Delivery n;
 
-                using var ctx = new AppDbContext();
+            using (var ctx = new AppDbContext()) {
                 bool anyLeft = false;
                 var d = (await ctx.Deliveries.FindAsync(year, did))!;
                 var lnr = await ctx.NextLNr(d.Date, d.ZwstId);
@@ -581,9 +577,7 @@ namespace Elwig.Services {
                 await ctx.SaveChangesAsync();
                 if (!anyLeft)
                     await ctx.Database.ExecuteSqlAsync($"DELETE FROM delivery WHERE (year, did) = ({d.Year}, {d.DId})");
-
+            }
-                return n;
-            });
 
             App.HintContextChange();
 
@@ -591,9 +585,9 @@ namespace Elwig.Services {
         }
 
         public static async Task<Delivery> SplitDeliveryToLsNr(int year, int did, int[] weights, string lsnr) {
-            var n = await Task.Run(async () => {
+            Delivery n;
-                Delivery n;
+
-                using var ctx = new AppDbContext();
+            using (var ctx = new AppDbContext()) {
                 var anyLeft = false;
                 n = (await ctx.Deliveries.FirstAsync(d => d.LsNr == lsnr))!;
                 var d = (await ctx.Deliveries.FindAsync(year, did))!;
@@ -622,9 +616,7 @@ namespace Elwig.Services {
                 await ctx.SaveChangesAsync();
                 if (!anyLeft && n.LsNr != d.LsNr)
                     await ctx.Database.ExecuteSqlAsync($"DELETE FROM delivery WHERE (year, did) = ({d.Year}, {d.DId})");
-
+            }
-                return n;
-            });
 
             App.HintContextChange();
 
@@ -632,8 +624,7 @@ namespace Elwig.Services {
         }
 
         public static async Task DepreciateDelivery(int year, int did, int[] weights) {
-            await Task.Run(async () => {
+            using (var ctx = new AppDbContext()) {
-                using var ctx = new AppDbContext();
                 var d = (await ctx.Deliveries.FindAsync(year, did))!;
                 var dpnr = await ctx.NextDPNr(year, did);
                 foreach (var (p, w) in d.Parts.ToList().Zip(weights)) {
@@ -657,23 +648,21 @@ namespace Elwig.Services {
                     }
                 }
                 await ctx.SaveChangesAsync();
-            });
+            }
 
             App.HintContextChange();
         }
 
         public static async Task GenerateDeliveryNote(int year, int did, ExportMode mode) {
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
-            await Task.Run(async () => {
+            try {
-                try {
+                using var ctx = new AppDbContext();
-                    using var ctx = new AppDbContext();
+                var d = (await ctx.Deliveries.FindAsync(year, did))!;
-                    var d = (await ctx.Deliveries.FindAsync(year, did))!;
+                using var doc = new DeliveryNote(d, ctx);
-                    using var doc = new DeliveryNote(d, ctx);
+                await Utils.ExportDocument(doc, mode, d.LsNr, (d.Member, $"{DeliveryNote.Name} Nr. {d.LsNr}", $"Im Anhang finden Sie den {DeliveryNote.Name} Nr. {d.LsNr}"));
-                    await Utils.ExportDocument(doc, mode, d.LsNr, (d.Member, $"{DeliveryNote.Name} Nr. {d.LsNr}", $"Im Anhang finden Sie den {DeliveryNote.Name} Nr. {d.LsNr}"));
+            } catch (Exception exc) {
-                } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
-                }
-            });
             Mouse.OverrideCursor = null;
         }
 
@@ -718,16 +707,14 @@ namespace Elwig.Services {
                     Title = $"{DeliveryJournal.Name} speichern unter - Elwig"
                 };
                 if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.Wait;
+                    Mouse.OverrideCursor = Cursors.AppStarting;
-                    await Task.Run(async () => {
+                    try {
-                        try {
+                        var data = await DeliveryJournalData.FromQuery(query, filterNames);
-                            var data = await DeliveryJournalData.FromQuery(query, filterNames);
+                        using var ods = new OdsFile(d.FileName);
-                            using var ods = new OdsFile(d.FileName);
+                        await ods.AddTable(data);
-                            await ods.AddTable(data);
+                    } catch (Exception exc) {
-                        } catch (Exception exc) {
+                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                            MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                    }
-                        }
-                    });
                     Mouse.OverrideCursor = null;
                 }
             } else if (mode == ExportMode.Export) {
@@ -738,64 +725,58 @@ namespace Elwig.Services {
                     Title = $"{DeliveryJournal.Name} speichern unter - Elwig"
                 };
                 if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.Wait;
+                    Mouse.OverrideCursor = Cursors.AppStarting;
-                    await Task.Run(async () => {
-                        try {
-                            await ElwigData.Export(d.FileName, await query
-                                .Select(p => p.Delivery)
-                                .Distinct()
-                                .Include(d => d.Parts)
-                                .ThenInclude(p => p.PartModifiers)
-                                .AsSplitQuery()
-                                .ToListAsync(), filterNames);
-                        } catch (Exception exc) {
-                            MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                        }
-                    });
-                    Mouse.OverrideCursor = null;
-                }
-            } else if (mode == ExportMode.Upload && App.Config.SyncUrl != null) {
-                Mouse.OverrideCursor = Cursors.Wait;
-                await Task.Run(async () => {
                     try {
-                        var filename = $"{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip";
+                        await ElwigData.Export(d.FileName, await query
-                        var path = Path.Combine(App.TempPath, filename);
-                        var list = await query
                             .Select(p => p.Delivery)
                             .Distinct()
                             .Include(d => d.Parts)
                             .ThenInclude(p => p.PartModifiers)
                             .AsSplitQuery()
-                            .ToListAsync();
+                            .ToListAsync(), filterNames);
-                        if (list.Count == 0) {
-                            MessageBox.Show("Es wurden keine Lieferungen zum Hochladen ausgewählt!", "Lieferungen hochladen",
-                                MessageBoxButton.OK, MessageBoxImage.Error);
-                        } else {
-                            await ElwigData.Export(path, list, filterNames);
-                            await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
-                            MessageBox.Show($"Hochladen von {list.Count:N0} Lieferungen erfolgreich!", "Lieferungen hochgeladen",
-                                MessageBoxButton.OK, MessageBoxImage.Information);
-                        }
-                    } catch (HttpRequestException exc) {
-                        MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Lieferungen hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
-                    } catch (TaskCanceledException exc) {
-                        MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                     } catch (Exception exc) {
                         MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                     }
-                });
+                    Mouse.OverrideCursor = null;
+                }
+            } else if (mode == ExportMode.Upload && App.Config.SyncUrl != null) {
+                Mouse.OverrideCursor = Cursors.AppStarting;
+                try {
+                    var filename = $"{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip";
+                    var path = Path.Combine(App.TempPath, filename);
+                    var list = await query
+                        .Select(p => p.Delivery)
+                        .Distinct()
+                        .Include(d => d.Parts)
+                        .ThenInclude(p => p.PartModifiers)
+                        .AsSplitQuery()
+                        .ToListAsync();
+                    if (list.Count == 0) {
+                        MessageBox.Show("Es wurden keine Lieferungen zum Hochladen ausgewählt!", "Lieferungen hochladen",
+                            MessageBoxButton.OK, MessageBoxImage.Error);
+                    } else {
+                        await ElwigData.Export(path, list, filterNames);
+                        await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
+                        MessageBox.Show($"Hochladen von {list.Count:N0} Lieferungen erfolgreich!", "Lieferungen hochgeladen",
+                            MessageBoxButton.OK, MessageBoxImage.Information);
+                    }
+                } catch (HttpRequestException exc) {
+                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Lieferungen hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
+                } catch (TaskCanceledException exc) {
+                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                } catch (Exception exc) {
+                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
                 Mouse.OverrideCursor = null;
             } else {
-                Mouse.OverrideCursor = Cursors.Wait;
+                Mouse.OverrideCursor = Cursors.AppStarting;
-                await Task.Run(async () => {
+                try {
-                    try {
+                    var data = await DeliveryJournalData.FromQuery(query, filterNames);
-                        var data = await DeliveryJournalData.FromQuery(query, filterNames);
+                    using var doc = new DeliveryJournal(string.Join(" / ", filterNames), data);
-                        using var doc = new DeliveryJournal(string.Join(" / ", filterNames), data);
+                    await Utils.ExportDocument(doc, mode);
-                        await Utils.ExportDocument(doc, mode);
+                } catch (Exception exc) {
-                    } catch (Exception exc) {
+                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
-                    }
-                });
                 Mouse.OverrideCursor = null;
             }
         }
@@ -817,16 +798,14 @@ namespace Elwig.Services {
                 throw new ArgumentException("Invalid value for ExportSubject");
             }
 
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
-            await Task.Run(async () => {
+            try {
-                try {
+                var data = await WineQualityStatisticsData.FromQuery(query, App.Client.OrderingMemberList);
-                    var data = await WineQualityStatisticsData.FromQuery(query, App.Client.OrderingMemberList);
+                using var doc = new WineQualityStatistics(string.Join(" / ", filterNames), data);
-                    using var doc = new WineQualityStatistics(string.Join(" / ", filterNames), data);
+                await Utils.ExportDocument(doc, mode);
-                    await Utils.ExportDocument(doc, mode);
+            } catch (Exception exc) {
-                } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
-                }
-            });
             Mouse.OverrideCursor = null;
         }
 
@@ -850,16 +829,14 @@ namespace Elwig.Services {
                 Title = $"Lieferstatistik pro Ort speichern unter - Elwig"
             };
             if (d.ShowDialog() == true) {
-                Mouse.OverrideCursor = Cursors.Wait;
+                Mouse.OverrideCursor = Cursors.AppStarting;
-                await Task.Run(async () => {
+                try {
-                    try {
+                    using var ods = new OdsFile(d.FileName);
-                        using var ods = new OdsFile(d.FileName);
+                    var tbl = await WineLocalityStatisticsData.FromQuery(query, filterNames);
-                        var tbl = await WineLocalityStatisticsData.FromQuery(query, filterNames);
+                    await ods.AddTable(tbl);
-                        await ods.AddTable(tbl);
+                } catch (Exception exc) {
-                    } catch (Exception exc) {
+                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
-                    }
-                });
                 Mouse.OverrideCursor = null;
             }
         }
@@ -898,37 +875,33 @@ namespace Elwig.Services {
                     Title = $"{DeliveryDepreciationList.Name} speichern unter - Elwig"
                 };
                 if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.Wait;
+                    Mouse.OverrideCursor = Cursors.AppStarting;
-                    await Task.Run(async () => {
-                        try {
-                            using var ods = new OdsFile(d.FileName);
-                            var tblTotal = await DeliveryJournalData.FromQuery(query, filterNames);
-                            tblTotal.FullName = DeliveryDepreciationList.Name;
-                            tblTotal.Name = "Gesamt";
-                            await ods.AddTable(tblTotal);
-                            foreach (var branch in await ctx.Branches.OrderBy(b => b.Name).ToListAsync()) {
-                                var tbl = await DeliveryJournalData.FromQuery(query.Where(p => p.Delivery.ZwstId == branch.ZwstId), filterNames);
-                                tbl.FullName = DeliveryDepreciationList.Name;
-                                tbl.Name = branch.Name;
-                                await ods.AddTable(tbl);
-                            }
-                        } catch (Exception exc) {
-                            MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                        }
-                    });
-                    Mouse.OverrideCursor = null;
-                }
-            } else {
-                Mouse.OverrideCursor = Cursors.Wait;
-                await Task.Run(async () => {
                     try {
-                        var data = await DeliveryJournalData.FromQuery(query, filterNames);
+                        using var ods = new OdsFile(d.FileName);
-                        using var doc = new DeliveryDepreciationList(string.Join(" / ", filterNames), data);
+                        var tblTotal = await DeliveryJournalData.FromQuery(query, filterNames);
-                        await Utils.ExportDocument(doc, mode);
+                        tblTotal.FullName = DeliveryDepreciationList.Name;
+                        tblTotal.Name = "Gesamt";
+                        await ods.AddTable(tblTotal);
+                        foreach (var branch in await ctx.Branches.OrderBy(b => b.Name).ToListAsync()) {
+                            var tbl = await DeliveryJournalData.FromQuery(query.Where(p => p.Delivery.ZwstId == branch.ZwstId), filterNames);
+                            tbl.FullName = DeliveryDepreciationList.Name;
+                            tbl.Name = branch.Name;
+                            await ods.AddTable(tbl);
+                        }
                     } catch (Exception exc) {
                         MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                     }
-                });
+                    Mouse.OverrideCursor = null;
+                }
+            } else {
+                Mouse.OverrideCursor = Cursors.AppStarting;
+                try {
+                    var data = await DeliveryJournalData.FromQuery(query, filterNames);
+                    using var doc = new DeliveryDepreciationList(string.Join(" / ", filterNames), data);
+                    await Utils.ExportDocument(doc, mode);
+                } catch (Exception exc) {
+                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
                 Mouse.OverrideCursor = null;
             }
         }
@@ -1097,12 +1070,10 @@ namespace Elwig.Services {
         }
 
         public static async Task DeleteDelivery(string lsnr) {
-            await Task.Run(async () => {
+            using (var ctx = new AppDbContext()) {
-                using var ctx = new AppDbContext();
                 await ctx.Deliveries.Where(d => d.LsNr == lsnr).ExecuteDeleteAsync();
                 await ctx.SaveChangesAsync();
-            });
+            }
-
             App.HintContextChange();
         }
     }

Elwig/Services/MemberService.cs

@@ -367,57 +367,51 @@ namespace Elwig.Services {
         }
 
         public static async Task GenerateMemberDataSheet(Member m, ExportMode mode) {
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
-            await Task.Run(async () => {
+            try {
-                try {
+                using var ctx = new AppDbContext();
-                    using var ctx = new AppDbContext();
+                using var doc = new MemberDataSheet(m, ctx);
-                    using var doc = new MemberDataSheet(m, ctx);
+                await Utils.ExportDocument(doc, mode, emailData: (m, MemberDataSheet.Name, "Im Anhang finden Sie das aktuelle Stammdatenblatt"));
-                    await Utils.ExportDocument(doc, mode, emailData: (m, MemberDataSheet.Name, "Im Anhang finden Sie das aktuelle Stammdatenblatt"));
+            } catch (Exception exc) {
-                } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
-                }
-            });
             Mouse.OverrideCursor = null;
         }
 
         public static async Task GenerateDeliveryConfirmation(Member m, int year, ExportMode mode) {
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
-            await Task.Run(async () => {
+            try {
-                try {
+                var b = new Billing(year);
-                    var b = new Billing(year);
+                await b.FinishSeason();
-                    await b.FinishSeason();
+                await b.CalculateBuckets();
-                    await b.CalculateBuckets();
+                App.HintContextChange();
-                    App.HintContextChange();
 
-                    using var ctx = new AppDbContext();
+                using var ctx = new AppDbContext();
-                    var data = await DeliveryConfirmationDeliveryData.ForMember(ctx.DeliveryParts, year, m);
+                var data = await DeliveryConfirmationDeliveryData.ForMember(ctx.DeliveryParts, year, m);
-                    using var doc = new DeliveryConfirmation(ctx, year, m, data);
+                using var doc = new DeliveryConfirmation(ctx, year, m, data);
-                    await Utils.ExportDocument(doc, mode, emailData: (m, $"{DeliveryConfirmation.Name} {year}", $"Im Anhang finden Sie die Anlieferungsbestätigung {year}"));
+                await Utils.ExportDocument(doc, mode, emailData: (m, $"{DeliveryConfirmation.Name} {year}", $"Im Anhang finden Sie die Anlieferungsbestätigung {year}"));
-                } catch (Exception exc) {
+            } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
+            }
-            });
             Mouse.OverrideCursor = null;
         }
 
         public static async Task GenerateCreditNote(Member m, int year, int avnr, ExportMode mode) {
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
-            await Task.Run(async () => {
+            try {
-                try {
+                using var ctx = new AppDbContext();
-                    using var ctx = new AppDbContext();
+                var v = (await ctx.PaymentVariants.FindAsync(year, avnr))!;
-                    var v = (await ctx.PaymentVariants.FindAsync(year, avnr))!;
+                var data = await CreditNoteDeliveryData.ForPaymentVariant(ctx.CreditNoteDeliveryRows, ctx.Seasons, year, avnr);
-                    var data = await CreditNoteDeliveryData.ForPaymentVariant(ctx.CreditNoteDeliveryRows, ctx.Seasons, year, avnr);
+                var p = (await ctx.MemberPayments.FindAsync(year, avnr, m.MgNr))!;
-                    var p = (await ctx.MemberPayments.FindAsync(year, avnr, m.MgNr))!;
+                var b = BillingData.FromJson((await ctx.PaymentVariants.FindAsync(year, avnr))!.Data);
-                    var b = BillingData.FromJson((await ctx.PaymentVariants.FindAsync(year, avnr))!.Data);
 
-                    using var doc = new CreditNote(ctx, p, data[m.MgNr],
+                using var doc = new CreditNote(ctx, p, data[m.MgNr],
-                        b.ConsiderContractPenalties, b.ConsiderTotalPenalty, b.ConsiderAutoBusinessShares, b.ConsiderCustomModifiers,
+                    b.ConsiderContractPenalties, b.ConsiderTotalPenalty, b.ConsiderAutoBusinessShares, b.ConsiderCustomModifiers,
-                        await ctx.GetMemberUnderDelivery(year, m.MgNr));
+                    await ctx.GetMemberUnderDelivery(year, m.MgNr));
-                    await Utils.ExportDocument(doc, mode, emailData: (m, $"{CreditNote.Name} {v.Name}", $"Im Anhang finden Sie die Traubengutschrift {v.Name}"));
+                await Utils.ExportDocument(doc, mode, emailData: (m, $"{CreditNote.Name} {v.Name}", $"Im Anhang finden Sie die Traubengutschrift {v.Name}"));
-                } catch (Exception exc) {
+            } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
+            }
-            });
             Mouse.OverrideCursor = null;
         }
 
@@ -470,16 +464,14 @@ namespace Elwig.Services {
                     Title = $"{MemberList.Name} speichern unter - Elwig"
                 };
                 if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.Wait;
+                    Mouse.OverrideCursor = Cursors.AppStarting;
-                    await Task.Run(async () => {
+                    try {
-                        try {
+                        var data = await MemberListData.FromQuery(query, filterNames, filterNames.Where(f => f.StartsWith("Flächenbindung")).Select(f => f.Split(' ')[^1]));
-                            var data = await MemberListData.FromQuery(query, filterNames, filterNames.Where(f => f.StartsWith("Flächenbindung")).Select(f => f.Split(' ')[^1]));
+                        using var ods = new OdsFile(d.FileName);
-                            using var ods = new OdsFile(d.FileName);
+                        await ods.AddTable(data);
-                            await ods.AddTable(data);
+                    } catch (Exception exc) {
-                        } catch (Exception exc) {
+                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                            MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                    }
-                        }
-                    });
                     Mouse.OverrideCursor = null;
                 }
             } else if (mode == ExportMode.Export) {
@@ -490,33 +482,8 @@ namespace Elwig.Services {
                     Title = $"{MemberList.Name} speichern unter - Elwig"
                 };
                 if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.Wait;
+                    Mouse.OverrideCursor = Cursors.AppStarting;
-                    await Task.Run(async () => {
-                        try {
-                            var members = await query
-                                .OrderBy(m => m.MgNr)
-                                .Include(m => m.BillingAddress)
-                                .Include(m => m.TelephoneNumbers)
-                                .Include(m => m.EmailAddresses)
-                                .AsSplitQuery()
-                                .ToListAsync();
-                            var areaComs = await query
-                                .SelectMany(m => m.AreaCommitments)
-                                .Include(c => c.Rd)
-                                .ToListAsync();
-                            await ElwigData.Export(d.FileName, members, areaComs, filterNames);
-                        } catch (Exception exc) {
-                            MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                        }
-                    });
-                    Mouse.OverrideCursor = null;
-                }
-            } else if (mode == ExportMode.Upload && App.Config.SyncUrl != null) {
-                Mouse.OverrideCursor = Cursors.Wait;
-                await Task.Run(async () => {
                     try {
-                        var filename = $"{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip";
-                        var path = Path.Combine(App.TempPath, filename);
                         var members = await query
                             .OrderBy(m => m.MgNr)
                             .Include(m => m.BillingAddress)
@@ -528,80 +495,99 @@ namespace Elwig.Services {
                             .SelectMany(m => m.AreaCommitments)
                             .Include(c => c.Rd)
                             .ToListAsync();
-                        if (members.Count == 0) {
+                        await ElwigData.Export(d.FileName, members, areaComs, filterNames);
-                            MessageBox.Show("Es wurden keine Mitglieder zum Hochladen ausgewählt!", "Mitglieder hochladen",
-                                MessageBoxButton.OK, MessageBoxImage.Error);
-                        } else {
-                            await ElwigData.Export(path, members, areaComs, filterNames);
-                            await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
-                            MessageBox.Show($"Hochladen von {members.Count:N0} Mitgliedern erfolgreich!", "Mitglieder hochgeladen",
-                                MessageBoxButton.OK, MessageBoxImage.Information);
-                        }
-                    } catch (HttpRequestException exc) {
-                        MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Mitglieder hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
-                    } catch (TaskCanceledException exc) {
-                        MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Mitglieder hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
                     } catch (Exception exc) {
                         MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                     }
-                });
+                    Mouse.OverrideCursor = null;
+                }
+            } else if (mode == ExportMode.Upload && App.Config.SyncUrl != null) {
+                Mouse.OverrideCursor = Cursors.AppStarting;
+                try {
+                    var filename = $"{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip";
+                    var path = Path.Combine(App.TempPath, filename);
+                    var members = await query
+                        .OrderBy(m => m.MgNr)
+                        .Include(m => m.BillingAddress)
+                        .Include(m => m.TelephoneNumbers)
+                        .Include(m => m.EmailAddresses)
+                        .AsSplitQuery()
+                        .ToListAsync();
+                    var areaComs = await query
+                        .SelectMany(m => m.AreaCommitments)
+                        .Include(c => c.Rd)
+                        .ToListAsync();
+                    if (members.Count == 0) {
+                        MessageBox.Show("Es wurden keine Mitglieder zum Hochladen ausgewählt!", "Mitglieder hochladen",
+                            MessageBoxButton.OK, MessageBoxImage.Error);
+                    } else {
+                        await ElwigData.Export(path, members, areaComs, filterNames);
+                        await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
+                        MessageBox.Show($"Hochladen von {members.Count:N0} Mitgliedern erfolgreich!", "Mitglieder hochgeladen",
+                            MessageBoxButton.OK, MessageBoxImage.Information);
+                    }
+                } catch (HttpRequestException exc) {
+                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Mitglieder hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
+                } catch (TaskCanceledException exc) {
+                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Mitglieder hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
+                } catch (Exception exc) {
+                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
                 Mouse.OverrideCursor = null;
             } else {
-                Mouse.OverrideCursor = Cursors.Wait;
+                Mouse.OverrideCursor = Cursors.AppStarting;
-                await Task.Run(async () => {
+                try {
-                    try {
+                    var data = await MemberListData.FromQuery(query, filterNames, filterNames.Where(f => f.StartsWith("Flächenbindung")).Select(f => f.Split(' ')[^1]));
-                        var data = await MemberListData.FromQuery(query, filterNames, filterNames.Where(f => f.StartsWith("Flächenbindung")).Select(f => f.Split(' ')[^1]));
+                    using var doc = new MemberList(string.Join(" / ", filterNames), data);
-                        using var doc = new MemberList(string.Join(" / ", filterNames), data);
+                    await Utils.ExportDocument(doc, mode);
-                        await Utils.ExportDocument(doc, mode);
+                } catch (Exception exc) {
-                    } catch (Exception exc) {
+                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
-                    }
-                });
                 Mouse.OverrideCursor = null;
             }
         }
 
         public static async Task<int> UpdateMember(this MemberAdminViewModel vm, int? oldMgNr) {
             var newMgNr = (int)vm.MgNr!;
-            var m = new Member {
-                MgNr = oldMgNr ?? newMgNr,
-                PredecessorMgNr = vm.PredecessorMgNr,
-                IsJuridicalPerson = vm.IsJuridicalPerson,
-                Prefix = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.Prefix) ? null : vm.Prefix,
-                GivenName = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.GivenName) ? null : vm.GivenName,
-                Name = vm.Name!,
-                Suffix = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.Suffix) ? null : vm.Suffix,
-                ForTheAttentionOf = !vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.ForTheAttentionOf) ? null : vm.ForTheAttentionOf,
-                Birthday = string.IsNullOrEmpty(vm.Birthday) ? null : string.Join("-", vm.Birthday!.Split(".").Reverse()),
-                IsDeceased = vm.IsDeceased,
-                CountryNum = 40,  // Austria AT AUT
-                PostalDestId = vm.Ort!.Id,
-                Address = vm.Address!,
 
-                Iban = string.IsNullOrEmpty(vm.Iban) ? null : vm.Iban?.Replace(" ", ""),
+            using (var ctx = new AppDbContext()) {
-                Bic = string.IsNullOrEmpty(vm.Bic) ? null : vm.Bic,
+                var m = new Member {
+                    MgNr = oldMgNr ?? newMgNr,
+                    PredecessorMgNr = vm.PredecessorMgNr,
+                    IsJuridicalPerson = vm.IsJuridicalPerson,
+                    Prefix = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.Prefix) ? null : vm.Prefix,
+                    GivenName = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.GivenName) ? null : vm.GivenName,
+                    Name = vm.Name!,
+                    Suffix = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.Suffix) ? null : vm.Suffix,
+                    ForTheAttentionOf = !vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.ForTheAttentionOf) ? null : vm.ForTheAttentionOf,
+                    Birthday = string.IsNullOrEmpty(vm.Birthday) ? null : string.Join("-", vm.Birthday!.Split(".").Reverse()),
+                    IsDeceased = vm.IsDeceased,
+                    CountryNum = 40,  // Austria AT AUT
+                    PostalDestId = vm.Ort!.Id,
+                    Address = vm.Address!,
 
-                UstIdNr = string.IsNullOrEmpty(vm.UstIdNr) ? null : vm.UstIdNr,
+                    Iban = string.IsNullOrEmpty(vm.Iban) ? null : vm.Iban?.Replace(" ", ""),
-                LfbisNr = string.IsNullOrEmpty(vm.LfbisNr) ? null : vm.LfbisNr,
+                    Bic = string.IsNullOrEmpty(vm.Bic) ? null : vm.Bic,
-                IsBuchführend = vm.IsBuchführend,
-                IsOrganic = vm.IsOrganic,
 
-                EntryDateString = string.IsNullOrEmpty(vm.EntryDate) ? null : string.Join("-", vm.EntryDate.Split(".").Reverse()),
+                    UstIdNr = string.IsNullOrEmpty(vm.UstIdNr) ? null : vm.UstIdNr,
-                ExitDateString = string.IsNullOrEmpty(vm.ExitDate) ? null : string.Join("-", vm.ExitDate.Split(".").Reverse()),
+                    LfbisNr = string.IsNullOrEmpty(vm.LfbisNr) ? null : vm.LfbisNr,
-                BusinessShares = (int)vm.BusinessShares!,
+                    IsBuchführend = vm.IsBuchführend,
-                AccountingNr = string.IsNullOrEmpty(vm.AccountingNr) ? null : vm.AccountingNr,
+                    IsOrganic = vm.IsOrganic,
-                IsActive = vm.IsActive,
+
-                IsVollLieferant = vm.IsVollLieferant,
+                    EntryDateString = string.IsNullOrEmpty(vm.EntryDate) ? null : string.Join("-", vm.EntryDate.Split(".").Reverse()),
-                IsFunktionär = vm.IsFunktionär,
+                    ExitDateString = string.IsNullOrEmpty(vm.ExitDate) ? null : string.Join("-", vm.ExitDate.Split(".").Reverse()),
-                ZwstId = vm.Branch?.ZwstId,
+                    BusinessShares = (int)vm.BusinessShares!,
-                DefaultKgNr = vm.DefaultKg?.KgNr,
+                    AccountingNr = string.IsNullOrEmpty(vm.AccountingNr) ? null : vm.AccountingNr,
-                Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
+                    IsActive = vm.IsActive,
-                ContactViaPost = vm.ContactViaPost,
+                    IsVollLieferant = vm.IsVollLieferant,
-                ContactViaEmail = vm.ContactViaEmail,
+                    IsFunktionär = vm.IsFunktionär,
-            };
+                    ZwstId = vm.Branch?.ZwstId,
+                    DefaultKgNr = vm.DefaultKg?.KgNr,
+                    Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
+                    ContactViaPost = vm.ContactViaPost,
+                    ContactViaEmail = vm.ContactViaEmail,
+                };
 
-            await Task.Run(async () => {
-                using var ctx = new AppDbContext();
                 if (oldMgNr != null) {
                     ctx.Update(m);
                 } else {
@@ -684,7 +670,7 @@ namespace Elwig.Services {
                 if (newMgNr != m.MgNr) {
                     await ctx.Database.ExecuteSqlAsync($"UPDATE member SET mgnr = {newMgNr} WHERE mgnr = {oldMgNr}");
                 }
-            });
+            }
 
             App.HintContextChange();
 
@@ -692,8 +678,7 @@ namespace Elwig.Services {
         }
 
         public static async Task DeleteMember(int mgnr, bool deletePaymentData, bool deleteDeliveries, bool deleteAreaComs) {
-            await Task.Run(async () => {
+            using (var ctx = new AppDbContext()) {
-                using var ctx = new AppDbContext();
                 var l = (await ctx.Members.FindAsync(mgnr))!;
                 if (deletePaymentData) {
                     ctx.RemoveRange(l.Credits);
@@ -706,8 +691,7 @@ namespace Elwig.Services {
                 }
                 ctx.Remove(l);
                 await ctx.SaveChangesAsync();
-            });
+            }
-
             App.HintContextChange();
         }
     }

Elwig/Windows/AreaComAdminWindow.xaml.cs

@@ -203,9 +203,13 @@ namespace Elwig.Windows {
                 $"Soll die Flächenbindung {a.GstNr} ({a.Area} m²) wirklich unwiderruflich gelöscht werden?",
                 "Flächenbindung löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
             if (r == MessageBoxResult.OK) {
-                Mouse.OverrideCursor = Cursors.Wait;
+                Mouse.OverrideCursor = Cursors.AppStarting;
                 try {
-                    await AreaComService.DeleteAreaCom(a.FbNr);
+                    using (var ctx = new AppDbContext()) {
+                        ctx.Remove(a);
+                        await ctx.SaveChangesAsync();
+                    }
+                    App.HintContextChange();
                 } catch (Exception exc) {
                     var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
                     if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
@@ -223,7 +227,7 @@ namespace Elwig.Windows {
 
         private async void AreaCommitmentSaveButton_Click(object? sender, RoutedEventArgs? evt) {
             AreaCommitmentSaveButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
 
             int fbnr;
             try {
@@ -233,8 +237,9 @@ namespace Elwig.Windows {
                 if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                 MessageBox.Show(str, "Flächenbindung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
                 AreaCommitmentSaveButton.IsEnabled = true;
-                Mouse.OverrideCursor = null;
                 return;
+            } finally {
+                Mouse.OverrideCursor = null;
             }
 
             IsEditing = false;
@@ -247,7 +252,6 @@ namespace Elwig.Windows {
             FinishInputFilling();
             await RefreshList();
             RefreshInputs();
-            Mouse.OverrideCursor = null;
             ViewModel.SearchQuery = "";
             ControlUtils.SelectItem(AreaCommitmentList, AreaCommitmentList.ItemsSource.Cast<AreaCom>().Where(a => a.FbNr == fbnr).FirstOrDefault());
         }

Elwig/Windows/BaseDataWindow.xaml.Season.cs

@@ -157,7 +157,7 @@ namespace Elwig.Windows {
             }
             var d = new NewSeasonDialog(s, currencies);
             if (d.ShowDialog() == true) {
-                Mouse.OverrideCursor = Cursors.Wait;
+                Mouse.OverrideCursor = Cursors.AppStarting;
                 try {
                     using var ctx = new AppDbContext();
                     ctx.Add(new Season {
@@ -209,7 +209,7 @@ namespace Elwig.Windows {
                 $"Soll die Saison {s.Year} wirklich unwiderruflich gelöscht werden?",
                 "Saison löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
             if (r == MessageBoxResult.OK) {
-                Mouse.OverrideCursor = Cursors.Wait;
+                Mouse.OverrideCursor = Cursors.AppStarting;
                 try {
                     using var ctx = new AppDbContext();
                     ctx.Remove(s);

Elwig/Windows/BaseDataWindow.xaml.cs

@@ -318,7 +318,8 @@ namespace Elwig.Windows {
 
         private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
             SaveButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
+
             try {
                 await Save();
             } catch (Exception exc) {
@@ -326,8 +327,9 @@ namespace Elwig.Windows {
                 if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                 MessageBox.Show(str, "Stammdaten aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
                 SaveButton.IsEnabled = true;
-                Mouse.OverrideCursor = null;
                 return;
+            } finally {
+                Mouse.OverrideCursor = null;
             }
 
             IsEditing = false;
@@ -347,7 +349,6 @@ namespace Elwig.Windows {
             }
 
             App.HintContextChange();
-            Mouse.OverrideCursor = null;
         }
 
         private void FillInputs(ClientParameters p, Season? s) {

Elwig/Windows/DeliveryAdminWindow.xaml.cs

@@ -719,7 +719,7 @@ namespace Elwig.Windows {
         private async void NewDeliveryPartButton_Click(object sender, RoutedEventArgs evt) {
             FinishButton.IsEnabled = false;
             NewDeliveryPartButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
             DeliveryPartList.IsEnabled = false;
 
             DeliveryPart? p;
@@ -757,7 +757,7 @@ namespace Elwig.Windows {
         private async void FinishButton_Click(object sender, RoutedEventArgs evt) {
             FinishButton.IsEnabled = false;
             NewDeliveryPartButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
             DeliveryPartList.IsEnabled = false;
 
             DeliveryPart? p;
@@ -888,7 +888,7 @@ namespace Elwig.Windows {
             if (res == null)
                 return;
 
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
             try {
                 var id = res.Value.Item1;
                 var weights = res.Value.Item2;
@@ -959,7 +959,7 @@ namespace Elwig.Windows {
                 $"Soll die Lieferung {d.LsNr} ({d.Member.AdministrativeName}, MgNr. {d.Member.MgNr}) wirklich unwiderruflich gelöscht werden?",
                 "Lieferung löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
             if (r == MessageBoxResult.OK) {
-                Mouse.OverrideCursor = Cursors.Wait;
+                Mouse.OverrideCursor = Cursors.AppStarting;
                 try {
                     await DeliveryService.DeleteDelivery(d.LsNr);
                 } catch (Exception exc) {
@@ -979,7 +979,7 @@ namespace Elwig.Windows {
 
         private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
             SaveButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
 
             DeliveryPart? p;
             try {
@@ -996,8 +996,9 @@ namespace Elwig.Windows {
                 if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                 MessageBox.Show(str, "Lieferung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
                 SaveButton.IsEnabled = true;
-                Mouse.OverrideCursor = null;
                 return;
+            } finally {
+                Mouse.OverrideCursor = null;
             }
 
             IsEditing = false;
@@ -1014,7 +1015,6 @@ namespace Elwig.Windows {
             await RefreshDeliveryParts();
             RefreshInputs();
 
-            Mouse.OverrideCursor = null;
             DepreciateButton.IsEnabled = true;
         }
 

Elwig/Windows/MainWindow.xaml.cs

@@ -62,7 +62,7 @@ namespace Elwig.Windows {
         }
 
         private async void Menu_Help_Smtp_Click(object sender, RoutedEventArgs evt) {
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
             try {
                 using var client = await Utils.GetSmtpClient();
                 await client!.DisconnectAsync(true);
@@ -133,10 +133,8 @@ namespace Elwig.Windows {
                     Multiselect = true,
                 };
                 if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.Wait;
+                    Mouse.OverrideCursor = Cursors.AppStarting;
-                    await Task.Run(async () => {
+                    await ElwigData.Import(d.FileNames, ElwigData.ImportMode.Interactively);
-                        await ElwigData.Import(d.FileNames, ElwigData.ImportMode.Interactively);
-                    });
                 }
             } catch (Exception exc) {
                 MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
@@ -147,81 +145,77 @@ namespace Elwig.Windows {
         private async void DownloadButton_Click(object sender, RoutedEventArgs evt) {
             if (App.Config.SyncUrl == null)
                 return;
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
-            await Task.Run(async () => {
+            try {
-                try {
+                var data = await Utils.GetExportMetaData(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
-                    var data = await Utils.GetExportMetaData(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
+                var files = data
-                    var files = data
+                    .Select(f => new {
-                        .Select(f => new {
+                        Name = f!["name"]!.AsValue().GetValue<string>(),
-                            Name = f!["name"]!.AsValue().GetValue<string>(),
+                        Timestamp = f!["timestamp"] != null && DateTime.TryParseExact(f!["timestamp"]!.AsValue().GetValue<string>(), "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None, out var dt) ? dt : (DateTime?)null,
-                            Timestamp = f!["timestamp"] != null && DateTime.TryParseExact(f!["timestamp"]!.AsValue().GetValue<string>(), "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None, out var dt) ? dt : (DateTime?)null,
+                        ZwstId = f!["meta"]?["zwstid"]?.AsValue().GetValue<string>() ?? f!["zwstid"]?.AsValue().GetValue<string>(),
-                            ZwstId = f!["meta"]?["zwstid"]?.AsValue().GetValue<string>() ?? f!["zwstid"]?.AsValue().GetValue<string>(),
+                        Device = f!["meta"]?["device"]!.AsValue().GetValue<string>(),
-                            Device = f!["meta"]?["device"]!.AsValue().GetValue<string>(),
+                        Url = f!["url"]!.AsValue().GetValue<string>(),
-                            Url = f!["url"]!.AsValue().GetValue<string>(),
+                        Size = f!["size"]!.AsValue().GetValue<long>(),
-                            Size = f!["size"]!.AsValue().GetValue<long>(),
+                    })
-                        })
+                    .Where(f => f.Timestamp >= new DateTime(Utils.CurrentLastSeason, 7, 1))
-                        .Where(f => f.Timestamp >= new DateTime(Utils.CurrentLastSeason, 7, 1))
+                    .ToList();
-                        .ToList();
 
-                    var imported = await ElwigData.GetImportedFiles();
+                var imported = await ElwigData.GetImportedFiles();
-                    var import = files
+                var import = files
-                        .Where(f => f.Device != Environment.MachineName && !imported.Contains(f.Name))
+                    .Where(f => f.Device != Environment.MachineName && !imported.Contains(f.Name))
-                        .ToList();
+                    .ToList();
-                    var paths = new List<string>();
+                var paths = new List<string>();
-                    using (var client = Utils.GetHttpClient(App.Config.SyncUsername, App.Config.SyncPassword)) {
+                using (var client = Utils.GetHttpClient(App.Config.SyncUsername, App.Config.SyncPassword)) {
-                        foreach (var f in import) {
+                    foreach (var f in import) {
-                            var filename = Path.Combine(App.TempPath, f.Name);
+                        var filename = Path.Combine(App.TempPath, f.Name);
-                            using var stream = new FileStream(filename, FileMode.Create);
+                        using var stream = new FileStream(filename, FileMode.Create);
-                            await client.DownloadAsync(f.Url, stream);
+                        await client.DownloadAsync(f.Url, stream);
-                            paths.Add(filename);
+                        paths.Add(filename);
-                        }
                     }
-                    await ElwigData.Import(paths, ElwigData.ImportMode.FromBranches);
-                } catch (HttpRequestException exc) {
-                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                } catch (TaskCanceledException exc) {
-                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
-            });
+                await ElwigData.Import(paths, ElwigData.ImportMode.FromBranches);
+            } catch (HttpRequestException exc) {
+                MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            } catch (TaskCanceledException exc) {
+                MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
             Mouse.OverrideCursor = null;
         }
 
         private async void UploadButton_Click(object sender, RoutedEventArgs evt) {
             if (App.Config.SyncUrl == null)
                 return;
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
-            await Task.Run(async () => {
+            try {
-                try {
+                var path = Path.Combine(App.TempPath, $"{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip");
-                    var path = Path.Combine(App.TempPath, $"{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip");
+                using var ctx = new AppDbContext();
-                    using var ctx = new AppDbContext();
+                var deliveries = await ctx.Deliveries
-                    var deliveries = await ctx.Deliveries
+                    .Where(d => d.Year == Utils.CurrentLastSeason && d.ZwstId == App.ZwstId)
-                        .Where(d => d.Year == Utils.CurrentLastSeason && d.ZwstId == App.ZwstId)
+                    .Include(d => d.Parts)
-                        .Include(d => d.Parts)
+                    .ThenInclude(p => p.PartModifiers)
-                        .ThenInclude(p => p.PartModifiers)
+                    .OrderBy(d => d.DateString)
-                        .OrderBy(d => d.DateString)
+                    .ThenBy(d => d.TimeString)
-                        .ThenBy(d => d.TimeString)
+                    .ThenBy(d => d.LsNr)
-                        .ThenBy(d => d.LsNr)
+                    .AsSplitQuery()
-                        .AsSplitQuery()
+                    .ToListAsync();
-                        .ToListAsync();
+                if (deliveries.Count == 0) {
-                    if (deliveries.Count == 0) {
+                    MessageBox.Show("Es gibt keine Lieferungen, die hochgeladen werden können!", "Lieferungen hochladen",
-                        MessageBox.Show("Es gibt keine Lieferungen, die hochgeladen werden können!", "Lieferungen hochladen",
+                        MessageBoxButton.OK, MessageBoxImage.Error);
-                            MessageBoxButton.OK, MessageBoxImage.Error);
+                } else {
-                    } else {
+                    await ElwigData.Export(path, deliveries, [$"{Utils.CurrentLastSeason}", $"Zweigstelle {App.BranchName}"]);
-                        await ElwigData.Export(path, deliveries, [$"{Utils.CurrentLastSeason}", $"Zweigstelle {App.BranchName}"]);
+                    await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
-                        await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
+                    MessageBox.Show($"Hochladen von {deliveries.Count:N0} Lieferungen erfolgreich!", "Lieferungen hochladen",
-                        MessageBox.Show($"Hochladen von {deliveries.Count:N0} Lieferungen erfolgreich!", "Lieferungen hochladen",
+                        MessageBoxButton.OK, MessageBoxImage.Information);
-                            MessageBoxButton.OK, MessageBoxImage.Information);
-                    }
-                } catch (HttpRequestException exc) {
-                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Lieferungen hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
-                } catch (TaskCanceledException exc) {
-                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Lieferungen hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
-            });
+            } catch (HttpRequestException exc) {
+                MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Lieferungen hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
+            } catch (TaskCanceledException exc) {
+                MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Lieferungen hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
             Mouse.OverrideCursor = null;
         }
 
@@ -276,31 +270,24 @@ namespace Elwig.Windows {
             AreaCommitmentsButton.IsEnabled = valid;
             BreakdownMemberVarietyButton.IsEnabled = valid;
 
-            SeasonStatMembersTotal.Text = "-";
-            SeasonStatMembersGeb.Text = "-";
-            SeasonStatWeightTotal.Text = "-";
-            SeasonStatWeightGeb.Text = "-";
-            SeasonStatWeightUngeb.Text = "-";
-            SeasonStatArea.Text = "-";
             if (valid) {
-                await Task.Run(async () => {
+                var areaComs = Utils.ActiveAreaCommitments(ctx.AreaCommitments, year!.Value);
-                    var membersTotal = await ctx.Deliveries.Where(d => d.Year == year).Select(d => d.Member).Distinct().CountAsync();
+                var weightTotal = await ctx.DeliveryParts.Where(p => p.Year == year).SumAsync(p => p.Weight);
-                    var areaComs = Utils.ActiveAreaCommitments(ctx.AreaCommitments, year!.Value);
+                var gebWeight = await ctx.DeliveryPartBuckets.Where(b => b.Year == year && b.Discr != "_").SumAsync(b => b.Value);
-                    var membersGeb = await areaComs.Select(c => c.Member).Distinct().CountAsync();
+                SeasonStatMembersTotal.Text = $"{await ctx.Deliveries.Where(d => d.Year == year).Select(d => d.Member).Distinct().CountAsync():N0}";
-                    var weightTotal = await ctx.DeliveryParts.Where(p => p.Year == year).SumAsync(p => p.Weight);
+                SeasonStatMembersGeb.Text = $"{await areaComs.Select(c => c.Member).Distinct().CountAsync():N0}";
-                    var gebWeight = await ctx.DeliveryPartBuckets.Where(b => b.Year == year && b.Discr != "_").SumAsync(b => b.Value);
+                SeasonStatWeightTotal.Text = $"{weightTotal:N0} kg";
-                    var area = await areaComs.SumAsync(c => c.Area);
+                SeasonStatWeightGeb.Text = $"{gebWeight:N0} kg";
-                    await App.MainDispatcher.BeginInvoke(() => {
+                SeasonStatWeightUngeb.Text = $"{weightTotal - gebWeight:N0} kg";
-                        if (year != SeasonInput.Value) return;
+                SeasonStatArea.Text = $"{await areaComs.SumAsync(c => c.Area):N0} m²";
-                        SeasonStatMembersTotal.Text = $"{membersTotal:N0}";
+            } else {
-                        SeasonStatMembersGeb.Text = $"{membersGeb:N0}";
+                SeasonStatMembersTotal.Text = "-";
-                        SeasonStatWeightTotal.Text = $"{weightTotal:N0} kg";
+                SeasonStatMembersGeb.Text = "-";
-                        SeasonStatWeightGeb.Text = $"{gebWeight:N0} kg";
+                SeasonStatWeightTotal.Text = "-";
-                        SeasonStatWeightUngeb.Text = $"{weightTotal - gebWeight:N0} kg";
+                SeasonStatWeightGeb.Text = "-";
-                        SeasonStatArea.Text = $"{area:N0} m²";
+                SeasonStatWeightUngeb.Text = "-";
-                    });
+                SeasonStatArea.Text = "-";
-                });
+            }
-            };
         }
 
         private void DeliveryConfirmationButton_Click(object sender, RoutedEventArgs evt) {
@@ -328,24 +315,22 @@ namespace Elwig.Windows {
             if (d.ShowDialog() == false)
                 return;
 
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
-            await Task.Run(async () => {
+            try {
-                try {
+                var b = new Billing(year);
-                    var b = new Billing(year);
+                await b.FinishSeason();
-                    await b.FinishSeason();
+                await b.CalculateBuckets();
-                    await b.CalculateBuckets();
+                App.HintContextChange();
-                    App.HintContextChange();
 
-                    using var ctx = new AppDbContext();
+                using var ctx = new AppDbContext();
-                    var tbl1 = await OverUnderDeliveryData.ForSeason(ctx.OverUnderDeliveryRows, year);
+                var tbl1 = await OverUnderDeliveryData.ForSeason(ctx.OverUnderDeliveryRows, year);
-                    var tbl2 = await AreaComUnderDeliveryData.ForSeason(ctx.AreaComUnderDeliveryRows, year);
+                var tbl2 = await AreaComUnderDeliveryData.ForSeason(ctx.AreaComUnderDeliveryRows, year);
-                    using var ods = new OdsFile(d.FileName);
+                using var ods = new OdsFile(d.FileName);
-                    await ods.AddTable(tbl1);
+                await ods.AddTable(tbl1);
-                    await ods.AddTable(tbl2);
+                await ods.AddTable(tbl2);
-                } catch (Exception exc) {
+            } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
+            }
-            });
             Mouse.OverrideCursor = null;
         }
 
@@ -361,26 +346,24 @@ namespace Elwig.Windows {
             if (d.ShowDialog() == false)
                 return;
 
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
-            await Task.Run(async () => {
+            try {
-                try {
+                var b = new Billing(year);
-                    var b = new Billing(year);
+                await b.FinishSeason();
-                    await b.FinishSeason();
+                await b.CalculateBuckets();
-                    await b.CalculateBuckets();
+                App.HintContextChange();
-                    App.HintContextChange();
 
-                    using var ctx = new AppDbContext();
+                using var ctx = new AppDbContext();
-                    using var ods = new OdsFile(d.FileName);
+                using var ods = new OdsFile(d.FileName);
-                    var tblTotal = await WeightBreakdownData.ForSeason(ctx.WeightBreakDownRows, year);
+                var tblTotal = await WeightBreakdownData.ForSeason(ctx.WeightBreakDownRows, year);
-                    await ods.AddTable(tblTotal);
+                await ods.AddTable(tblTotal);
-                    foreach (var branch in await ctx.Branches.OrderBy(b => b.Name).ToListAsync()) {
+                foreach (var branch in await ctx.Branches.OrderBy(b => b.Name).ToListAsync()) {
-                        var tbl = await WeightBreakdownData.ForSeason(ctx.WeightBreakDownRows, year, branch);
+                    var tbl = await WeightBreakdownData.ForSeason(ctx.WeightBreakDownRows, year, branch);
-                        await ods.AddTable(tbl);
+                    await ods.AddTable(tbl);
-                    }
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
-            });
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
             Mouse.OverrideCursor = null;
         }
 
@@ -396,22 +379,20 @@ namespace Elwig.Windows {
             if (d.ShowDialog() == false)
                 return;
 
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
-            await Task.Run(async () => {
+            try {
-                try {
+                var b = new Billing(year);
-                    var b = new Billing(year);
+                await b.FinishSeason();
-                    await b.FinishSeason();
+                await b.CalculateBuckets();
-                    await b.CalculateBuckets();
+                App.HintContextChange();
-                    App.HintContextChange();
 
-                    using var ctx = new AppDbContext();
+                using var ctx = new AppDbContext();
-                    var tbl = await MemberAreaComsData.ForSeason(ctx.MemberAreaComsRows, year);
+                var tbl = await MemberAreaComsData.ForSeason(ctx.MemberAreaComsRows, year);
-                    using var ods = new OdsFile(d.FileName);
+                using var ods = new OdsFile(d.FileName);
-                    await ods.AddTable(tbl);
+                await ods.AddTable(tbl);
-                } catch (Exception exc) {
+            } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
+            }
-            });
             Mouse.OverrideCursor = null;
         }
 
@@ -427,22 +408,20 @@ namespace Elwig.Windows {
             if (d.ShowDialog() == false)
                 return;
 
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
-            await Task.Run(async () => {
+            try {
-                try {
+                var b = new Billing(year);
-                    var b = new Billing(year);
+                await b.FinishSeason();
-                    await b.FinishSeason();
+                await b.CalculateBuckets();
-                    await b.CalculateBuckets();
+                App.HintContextChange();
-                    App.HintContextChange();
 
-                    using var ctx = new AppDbContext();
+                using var ctx = new AppDbContext();
-                    var tbl = await MemberDeliveryPerVarietyData.ForSeason(ctx.MemberDeliveryPerVariantRows, year);
+                var tbl = await MemberDeliveryPerVarietyData.ForSeason(ctx.MemberDeliveryPerVariantRows, year);
-                    using var ods = new OdsFile(d.FileName);
+                using var ods = new OdsFile(d.FileName);
-                    await ods.AddTable(tbl);
+                await ods.AddTable(tbl);
-                } catch (Exception exc) {
+            } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
+            }
-            });
             Mouse.OverrideCursor = null;
         }
     }

Elwig/Windows/MemberAdminWindow.xaml.cs

@@ -389,7 +389,7 @@ namespace Elwig.Windows {
             }
             var d = new DeleteMemberDialog(m.MgNr, m.AdministrativeName, areaComs, deliveries, credits);
             if (d.ShowDialog() == true) {
-                Mouse.OverrideCursor = Cursors.Wait;
+                Mouse.OverrideCursor = Cursors.AppStarting;
                 try {
                     await MemberService.DeleteMember(m.MgNr, d.DeletePaymentData, d.DeleteDeliveries, d.DeleteAreaComs);
                 } catch (Exception exc) {
@@ -408,7 +408,7 @@ namespace Elwig.Windows {
         }
 
         private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
             SaveButton.IsEnabled = false;
 
             int mgnr;
@@ -419,8 +419,9 @@ namespace Elwig.Windows {
                 if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                 MessageBox.Show(str, "Mitglied aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
                 SaveButton.IsEnabled = true;
-                Mouse.OverrideCursor = null;
                 return;
+            } finally {
+                Mouse.OverrideCursor = null;
             }
 
             IsEditing = false;
@@ -435,7 +436,6 @@ namespace Elwig.Windows {
             await RefreshList();
             RefreshInputs();
             ViewModel.SearchQuery = "";
-            Mouse.OverrideCursor = null;
             if (mgnr is int m)
                 FocusMember(m);
         }
@@ -491,17 +491,15 @@ namespace Elwig.Windows {
 
         private async void Menu_Contact_Letterhead_Click(object sender, RoutedEventArgs evt) {
             if (ViewModel.SelectedMember is not Member m) return;
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
             try {
-                await Task.Run(async () => {
+                using var doc = new Letterhead(m);
-                    using var doc = new Letterhead(m);
+                await doc.Generate();
-                    await doc.Generate();
+                if (!App.Config.Debug) {
-                    if (!App.Config.Debug) {
+                    await doc.Print();
-                        await doc.Print();
+                } else {
-                    } else {
+                    doc.Show();
-                        doc.Show();
+                }
-                    }
-                });
             } catch (Exception exc) {
                 MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
             }