Changeset 77252 in vbox for trunk/src/VBox/Main/src-all

Timestamp:

Feb 11, 2019 8:42:08 AM (6 years ago)

Author:

vboxsync

Message:

bugref:9349. Fixed aTimeRemaining wrong calculation.

File:

• trunk/src/VBox/Main/src-all/ProgressImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-all/ProgressImpl.cpp

@@ -572 +572 @@
             uint64_t ullTimeElapsed = ullTimeNow - m_ullTimestamp;
             uint64_t ullTimeTotal = (uint64_t)((double)ullTimeElapsed * 100 / dPercentDone);
-            int64_t ullTimeRemaining = ullTimeTotal - ullTimeElapsed;
+            uint64_t ullTimeRemaining = (ullTimeTotal < ullTimeElapsed) ? 0 : ullTimeTotal - ullTimeElapsed;
 
 //          LogFunc(("dPercentDone = %RI32, ullTimeNow = %RI64, ullTimeElapsed = %RI64, ullTimeTotal = %RI64, ullTimeRemaining = %RI64\n",
 //                   (uint32_t)dPercentDone, ullTimeNow, ullTimeElapsed, ullTimeTotal, ullTimeRemaining));
 
-            *aTimeRemaining = (LONG)(ullTimeRemaining / 1000);
+            *aTimeRemaining = (LONG)(RT_MIN(ullTimeRemaining, RT_MS_1HOUR_64*24*365) / 1000);
         }
     }