Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 11 insertions, 1 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs
index f1c722d96..dfa9b833b 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs
@@ -44,6 +44,7 @@ namespace Tango.PPC.Common.MachineSetup
         private IOperationSystemManager _windows_manager;
         private PPCWebClient _client;
         private List<LogItemBase> _logs;
+        private bool _isUpdating;
 
         #region Events
 
@@ -93,7 +94,10 @@ namespace Tango.PPC.Common.MachineSetup
 
         private void LogManager_NewLog(object sender, LogItemBase e)
         {
-            _logs.Add(e);
+            if (_isUpdating)
+            {
+                _logs.Add(e);
+            }
         }
 
         #endregion
@@ -136,6 +140,8 @@ namespace Tango.PPC.Common.MachineSetup
                     LogManager.Log(xx, "Error notifying setup completed.");
                 }
             }
+
+            _isUpdating = false;
         }
 
         private async void OnCompleted(MachineSetupResult result, TaskCompletionSource<MachineSetupResult> completionSource, MachineSetupResponse response)
@@ -157,6 +163,8 @@ namespace Tango.PPC.Common.MachineSetup
                     LogManager.Log(xx, "Error notifying setup completed.");
                 }
             }
+
+            _isUpdating = false;
         }
 
         private String GetLogsStringAndClear()
@@ -186,6 +194,8 @@ namespace Tango.PPC.Common.MachineSetup
 
             try
             {
+                _isUpdating = true;
+
                 LogManager.Log($"Starting machine setup for serial number {serialNumber}...");
 
                 var machineServiceAddress = SettingsManager.Default.GetOrCreate<PPCSettings>().GetMachineServiceAddress();