Changeset 1849

Timestamp:

2/17/2010 1:00:50 PM (2 years ago)

Author:

lowjoel

Message:

Fixed possible NaN value when we divide the amount of work left by the speed.

File:

• trunk/eraser6/Eraser.Util/ProgressManager.cs (modified) (1 diff)

trunk/eraser6/Eraser.Util/ProgressManager.cs

@@ -433 +433 @@
             {
                 float speed = Speed;
-                if (speed == 0.0)
+                float remaining = 1.0f - Progress;
+
+                if (speed == 0)
                     return TimeSpan.MinValue;
-
-                return TimeSpan.FromSeconds((1.0f - Progress) / speed);
+                else if (remaining <= 0)
+                    return TimeSpan.Zero;
+                else
+                    return TimeSpan.FromSeconds(remaining / speed);
             }
         }