From 43be8bf3915780ab7bc7b0ff6aff5a6d71e5dfae Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Tue, 19 Sep 2023 00:47:10 +0200
Subject: [PATCH] DeliveryAdminWindow: Empty scale only after saving to
 database

---
 Elwig/Windows/DeliveryAdminWindow.xaml.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml.cs b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
index 83ad1a9..bf7e5ba 100644
--- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
@@ -656,7 +656,6 @@ namespace Elwig.Windows {
                     WeightInput.Text = $"{res.Weight:N0}";
                     ScaleId = s.ScaleId;
                     WeighingId = res.FullWeighingId;
-                    s.Empty();
                 } else {
                     WeightInput.Text = "";
                     ScaleId = null;
@@ -762,12 +761,19 @@ namespace Elwig.Windows {
             }
         }
 
+        private void EmptyScale() {
+            var scale = App.Scales.Where(s => s.ScaleId == ScaleId).FirstOrDefault();
+            if (scale == null) return;
+            scale.Empty();
+        }
+
         private async void NewDeliveryPartButton_Click(object sender, RoutedEventArgs evt) {
             FinishButton.IsEnabled = false;
             NewDeliveryPartButton.IsEnabled = false;
             NewDeliveryPartButton.Cursor = Cursors.Wait;
             DeliveryPartList.IsEnabled = false;
             var p = await UpdateDeliveryPart(DeliveryList.SelectedItem as Delivery, DeliveryPartList.SelectedItem as DeliveryPart);
+			EmptyScale();
             await RefreshDeliveryList();
             await RefreshDeliveryParts();
             NewDeliveryPartButton.Cursor = null;
@@ -783,7 +789,8 @@ namespace Elwig.Windows {
             FinishButton.Cursor = Cursors.Wait;
             DeliveryPartList.IsEnabled = false;
             var p = await UpdateDeliveryPart(DeliveryList.SelectedItem as Delivery, DeliveryPartList.SelectedItem as DeliveryPart);
-            await RefreshDeliveryList();
+			EmptyScale();
+			await RefreshDeliveryList();
             await RefreshDeliveryParts();
             if (p?.Delivery != null) {
                 Mouse.OverrideCursor = Cursors.Wait;