1 files changed, 20 insertions, 23 deletions
diff --git a/src/PriceListTools/CombineTool.cs b/src/PriceListTools/CombineTool.cs
index 26a2832..cd3fc8a 100644
--- a/src/PriceListTools/CombineTool.cs
+++ b/src/PriceListTools/CombineTool.cs
@@ -3,7 +3,6 @@ using RehauSku.Interface;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using Dialog = RehauSku.Interface.Dialog;
 
 namespace RehauSku.PriceListTools
@@ -27,33 +26,31 @@ namespace RehauSku.PriceListTools
             }
         }
 
-        public override async void FillTarget()
+        public override void FillTarget()
         {
-            ProgressBar = new ProgressBar("Заполняю строки...", SourceFiles.Sum(file => file.PositionAmount.Count));
-            ResultBar = new ResultBar();
-
-            foreach (SourcePriceList source in SourceFiles)
+            using (ProgressBar = new ProgressBar("Заполняю строки...", SourceFiles.Sum(file => file.PositionAmount.Count)))
+            using (ResultBar = new ResultBar())
             {
-                TargetFile.Sheet.Columns[TargetFile.AmountCell.Column]
-                    .EntireColumn
-                    .Insert(XlInsertShiftDirection.xlShiftToRight, XlInsertFormatOrigin.xlFormatFromRightOrBelow);
-
-                Range newColumnHeader = TargetFile.Sheet.Cells[TargetFile.AmountCell.Row, TargetFile.AmountCell.Column - 1];
-                newColumnHeader.Value2 = $"{source.Name}";
-                newColumnHeader.WrapText = true;
-
-                foreach (var kvp in source.PositionAmount)
+                foreach (SourcePriceList source in SourceFiles)
                 {
-                    FillPositionAmountToColumns(kvp, TargetFile.AmountCell.Column - 1, TargetFile.AmountCell.Column);
-                    ProgressBar.Update();
+                    TargetFile.Sheet.Columns[TargetFile.AmountCell.Column]
+                        .EntireColumn
+                        .Insert(XlInsertShiftDirection.xlShiftToRight, XlInsertFormatOrigin.xlFormatFromRightOrBelow);
+
+                    Range newColumnHeader = TargetFile.Sheet.Cells[TargetFile.AmountCell.Row, TargetFile.AmountCell.Column - 1];
+                    newColumnHeader.Value2 = $"{source.Name}";
+                    newColumnHeader.WrapText = true;
+
+                    foreach (var kvp in source.PositionAmount)
+                    {
+                        FillPositionAmountToColumns(kvp, TargetFile.AmountCell.Column - 1, TargetFile.AmountCell.Column);
+                        ProgressBar.Update();
+                    }
                 }
-            }
-
-            FilterByAmount();
-            ResultBar.Update();
 
-            await Task.Delay(new TimeSpan(0, 0, 5));
-            ExcelApp.StatusBar = false;
+                FilterByAmount();
+                ResultBar.Update();
+            }
         }
     }
 }