diff options
| author | Roy <Roy.mail.net@gmail.com> | 2023-07-10 08:59:44 +0300 |
|---|---|---|
| committer | Roy <Roy.mail.net@gmail.com> | 2023-07-10 08:59:44 +0300 |
| commit | 98998e64bd4bd1c7c516019eeb2649693eee175f (patch) | |
| tree | 2b85378d410b244f4b4673ff5023d92b9f91213e /Software/Visual_Studio/Tango.Integration | |
| parent | 29c5cb29d6653164328720f7b360f234d9b68a56 (diff) | |
| parent | a906e7316bc179888f475f6bcff5ddc20a501346 (diff) | |
| download | Tango-98998e64bd4bd1c7c516019eeb2649693eee175f.tar.gz Tango-98998e64bd4bd1c7c516019eeb2649693eee175f.zip | |
Merge branch 'eureka' of https://twinetfs.visualstudio.com/Tango/_git/Tango into eureka
Diffstat (limited to 'Software/Visual_Studio/Tango.Integration')
| -rw-r--r-- | Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs index 23bd2b1ba..4579ff08c 100644 --- a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs +++ b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs @@ -516,7 +516,8 @@ namespace Tango.Integration.Operation TimeSpan segmentsDuration = Job.TranslateProgressToTime(previousSegmentsLengthWithThis, ProcessParameters); TimeSpan segmentRemainingTime = segmentsDuration - Job.TranslateProgressToTime(Status.Progress, ProcessParameters); - segment.Progress = Math.Min(Math.Max((previousSegmentsLengthWithThis - segment.Length - Status.Progress) * -1, 0), segment.Length); + // segment.Progress = Math.Min(Math.Max((previousSegmentsLengthWithThis - segment.Length - Status.Progress) * -1, 0), segment.Length); + segment.Progress = Math.Min(Math.Max((previousSegmentsLengthWithThis - segment.Length - Status.ProgressMinusSettingUp) * -1, 0), segment.Length); if (i == 0 && Status.Progress > 0) { @@ -526,8 +527,9 @@ namespace Tango.Integration.Operation Status.CurrentSegment = segment; } } - - if (Status.Progress >= previousSegmentsLengthWithThis) + + //if (Status.Progress >= previousSegmentsLengthWithThis) + if (Status.ProgressMinusSettingUp >= previousSegmentsLengthWithThis) { if (!segment.Completed) { |