Merged Beta+ fixes to master.

1 files changed, 16 insertions, 7 deletions

diff --git a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
index 7b3ed0612..d4a16a7e3 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
@@ -240,6 +240,12 @@ namespace Tango.Integration.Operation
         /// </summary>
         internal void RaiseCompleted()
         {
+            InvalidateJobProgress(new JobStatus()
+            {
+                Progress = Status.TotalProgress,
+                CurrentSegmentIndex = 0,
+            });
+
             LogManager.Log($"Job completed at position {Status.Progress}/{Status.TotalProgress}...");
             Status.Segments.Last().Completed = true;
             Status.RemainingUnits = 0;
@@ -284,14 +290,17 @@ namespace Tango.Integration.Operation
         {
             bool invalidProgress = false;
 
-            if (s.Progress <= PROGRESS_REPORT_RANGE_METERS || s.Progress >= Status.TotalProgress - PROGRESS_REPORT_RANGE_METERS)
-            {
-                LogManager.Log($"Updating job progress {s.Progress}/{Status.TotalProgress}...");
-            }
-            else if (!loggedContinueMessage)
+            if (_last_progress != s.Progress)
             {
-                loggedContinueMessage = true;
-                LogManager.Log($"Progress logging will continue {PROGRESS_REPORT_RANGE_METERS} meters before completion...");
+                if (s.Progress <= PROGRESS_REPORT_RANGE_METERS || s.Progress >= Status.TotalProgress - PROGRESS_REPORT_RANGE_METERS)
+                {
+                    LogManager.Log($"Updating job progress {s.Progress}/{Status.TotalProgress}...");
+                }
+                else if (!loggedContinueMessage)
+                {
+                    loggedContinueMessage = true;
+                    LogManager.Log($"Progress logging will continue {PROGRESS_REPORT_RANGE_METERS} meters before completion...");
+                }
             }
 
             if (s.Progress < 0)